aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZach Brown <[email protected]>2016-11-19 22:10:51 -0600
committerZach Brown <[email protected]>2016-11-19 22:10:51 -0600
commit9410004c4416e7c7369683bf950e7d670a20f250 (patch)
tree885f12871f538d939f5daf4f98ea59c599d779bd
parent6c1880847fd1695b567b77c4383322a7d00a23f9 (diff)
downloadPaper-9410004c4416e7c7369683bf950e7d670a20f250.tar.gz
Paper-9410004c4416e7c7369683bf950e7d670a20f250.zip
SPIGOT-2806: Backport an event fix
-rw-r--r--Spigot-Server-Patches/0183-SPIGOT-2806-Backport-an-event-fix.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0183-SPIGOT-2806-Backport-an-event-fix.patch b/Spigot-Server-Patches/0183-SPIGOT-2806-Backport-an-event-fix.patch
new file mode 100644
index 0000000000..3d2a433662
--- /dev/null
+++ b/Spigot-Server-Patches/0183-SPIGOT-2806-Backport-an-event-fix.patch
@@ -0,0 +1,27 @@
+From 37e98905edef29a276d3021bf1edbcf143e98ca0 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Sat, 19 Nov 2016 22:10:34 -0600
+Subject: [PATCH] SPIGOT-2806: Backport an event fix
+
+
+diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
+index d39ffbe..844916f 100644
+--- a/src/main/java/net/minecraft/server/Container.java
++++ b/src/main/java/net/minecraft/server/Container.java
+@@ -230,8 +230,12 @@ public abstract class Container {
+ if (i == -999) {
+ if (playerinventory.getCarried() != null) {
+ if (j == 0) {
+- entityhuman.drop(playerinventory.getCarried(), true);
++ // Paper start - Backport an event fix - SPIGOT-2806
++ //entityhuman.drop(playerinventory.getCarried(), true);
++ ItemStack carried = playerinventory.getCarried();
+ playerinventory.setCarried((ItemStack) null);
++ entityhuman.drop(carried, true);
++ // Paper end
+ }
+
+ if (j == 1) {
+--
+2.10.2
+