Updated Upstream (Bukkit/CraftBukkit) for LootTable API

I have tested that the Replenishing Feature still works as expected.
Lootable API's that now have Bukkit equivalents are now deprecated.

Bukkit Changes:
f0f33981 SPIGOT-1936: LootTable API

CraftBukkit Changes:
c0df4b82 SPIGOT-1936: LootTable API
This commit is contained in:
Aikar 2018-08-12 13:11:08 -04:00
parent 668ad2cf0b
commit 3a70bed5f4
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
37 changed files with 480 additions and 401 deletions

View file

@ -1,11 +1,11 @@
From a16608e4c4b20cad5477b8be0c935581a1d0895f Mon Sep 17 00:00:00 2001
From 94aaaeb3d173b4f5a3f4e9d8943dd46b12a3a9ea Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 477a5833..73c85063 100644
index bfe388fc0..dbfd6e41d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
@ -20,7 +20,7 @@ index 477a5833..73c85063 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -1263,6 +1260,17 @@ public final class Bukkit {
@@ -1274,6 +1271,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -39,7 +39,7 @@ index 477a5833..73c85063 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1fa6f53e..70e19580 100644
index 9b71cbffc..c23ae761e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
@ -54,7 +54,7 @@ index 1fa6f53e..70e19580 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -956,6 +953,14 @@ public interface Server extends PluginMessageRecipient {
@@ -957,6 +954,14 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end