Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
6de6ac4a BlockDropItemEvent should refer to getBlockState rather than getBlockData
2b555a75 Fix BlockDropItemEvent for Skulls and Shulker Boxes

CraftBukkit Changes:
f17d591c Fix BlockDropItemEvent for Skulls and Shulker Boxes

Spigot Changes:
f56e2e78 Catch async recipe add
This commit is contained in:
Shane Freeder 2019-01-07 18:24:51 +00:00
parent ae4e86af2d
commit 6d463efbe0
6 changed files with 6 additions and 6 deletions

View File

@ -186,7 +186,7 @@ index bf061cf06..55f978768 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index 32b0e7965..5b8ddc76e 100644
index a165378ac..50a1239c2 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -0,0 +0,0 @@ public class PlayerInteractManager {

View File

@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
when cancelling interaction.
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index aa7780eff..23223e89d 100644
index 50a1239c2..ef0b03795 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -0,0 +0,0 @@ public class PlayerInteractManager {

View File

@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
the item used.
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index 1d76c4c99..be6cd6adf 100644
index cf5392311..843644933 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -0,0 +0,0 @@ public class PlayerInteractManager {

@ -1 +1 @@
Subproject commit 5b680f0b3229afd88011315696d19fc1c04d32e6
Subproject commit 6de6ac4a8b5e3015be6105e96ff579508b9a6fc0

@ -1 +1 @@
Subproject commit 5932f8a7dae0fbf852592579edfa277ab260752a
Subproject commit f17d591cc9a57323b254d3981c8944e1c05bf37f

@ -1 +1 @@
Subproject commit 19c3c5a51d345122f722bc1edf2a703dc40cee3c
Subproject commit f56e2e787f425025af0d7410ff4cdb4f8edf7f3b