summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-01-28 09:44:16 +1100
committermd_5 <git@md-5.net>2018-01-28 09:44:16 +1100
commitdac2a4a6ae4dcc26ffac0e6d5bc883ce98a676d2 (patch)
treebb65233ea707d49b560fafd222e7226720668de7
parentc7656468e4601fb70e0d7049c4b947e16034546f (diff)
downloadcraftbukkit-dac2a4a6ae4dcc26ffac0e6d5bc883ce98a676d2.tar
craftbukkit-dac2a4a6ae4dcc26ffac0e6d5bc883ce98a676d2.tar.gz
craftbukkit-dac2a4a6ae4dcc26ffac0e6d5bc883ce98a676d2.tar.lz
craftbukkit-dac2a4a6ae4dcc26ffac0e6d5bc883ce98a676d2.tar.xz
craftbukkit-dac2a4a6ae4dcc26ffac0e6d5bc883ce98a676d2.zip
SPIGOT-3784: Reset horse chests after event
-rw-r--r--nms-patches/EntityHorseChestedAbstract.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/nms-patches/EntityHorseChestedAbstract.patch b/nms-patches/EntityHorseChestedAbstract.patch
index 99c2c11a..2e49b194 100644
--- a/nms-patches/EntityHorseChestedAbstract.patch
+++ b/nms-patches/EntityHorseChestedAbstract.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityHorseChestedAbstract.java
+++ b/net/minecraft/server/EntityHorseChestedAbstract.java
-@@ -43,7 +43,7 @@
+@@ -43,14 +43,18 @@
}
public void die(DamageSource damagesource) {
@@ -9,11 +9,15 @@
if (this.isCarryingChest()) {
if (!this.world.isClientSide) {
this.a(Item.getItemOf(Blocks.CHEST), 1);
-@@ -51,6 +51,7 @@
+ }
- this.setCarryingChest(false);
+- this.setCarryingChest(false);
++ // this.setCarryingChest(false); // CraftBukkit - moved down
}
-+ super.die(damagesource); // CraftBukkit
++ // CraftBukkit start
++ super.die(damagesource);
++ this.setCarryingChest(false);
++ // CraftBukkit end
}