Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated
00763e1b Deprecate some methods
35a83d54 SPIGOT-4572: Make default no permission message clearer
6163343d Fix some misplaced material enum entries
8736469c Fix typo in TechnicalPiston documentation

CraftBukkit Changes:
0c715b32 SPIGOT-4579: Shulker boxes not dropping in creative
50fbc3f1 SPIGOT-4576: Fix attributes in itemstack internal data being lost
8059a937 SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml
07e504c3 Clarify exception thrown when setting drop chance for player inventory
98b862ad Fix duplicate iron golem add
843cee65 Fix a bunch of duplicate EntityCombustEvent calls
43855624 SPIGOT-4571: EntityCombustEvent not firing for phantoms
This commit is contained in:
Shane Freeder
2019-01-15 21:12:19 +00:00
parent 21ba01aaf4
commit 54dd19b818
56 changed files with 404 additions and 402 deletions

View File

@@ -1,14 +1,14 @@
From 76b7c9bfc8893c63975484bf9223df8c1e50c6e7 Mon Sep 17 00:00:00 2001
From 96b07d31cd5a0d02af4482fc3e8141ec8b360c8e 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 a20c7b73..32db4b77 100644
index 8a6529f3..d4b7c539 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1390,6 +1390,17 @@ public final class Bukkit {
@@ -1394,6 +1394,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@@ -27,10 +27,10 @@ index a20c7b73..32db4b77 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6e8b1380..10ee377a 100644
index 9651a45c..b9a75b2d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1061,6 +1061,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1065,6 +1065,14 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end
@@ -46,5 +46,5 @@ index 6e8b1380..10ee377a 100644
* Get the advancement specified by this key.
*
--
2.19.1
2.20.1