summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-01-04 20:42:31 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-01-04 20:42:31 +0000
commitc051558691aefb2f71eabefa226e24912bb692e2 (patch)
tree5ee58a646819f8108e810ad16c509b3c08e8f08c
parentd4eaf226f97d66f35f4a62bf07626646ea2ec0b0 (diff)
downloadcraftbukkit-c051558691aefb2f71eabefa226e24912bb692e2.tar
craftbukkit-c051558691aefb2f71eabefa226e24912bb692e2.tar.gz
craftbukkit-c051558691aefb2f71eabefa226e24912bb692e2.tar.lz
craftbukkit-c051558691aefb2f71eabefa226e24912bb692e2.tar.xz
craftbukkit-c051558691aefb2f71eabefa226e24912bb692e2.zip
SPIGOT-296: Fix stack overflow when a dispense event is set to bonemeal
-rw-r--r--nms-patches/DispenseBehaviorItem.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/DispenseBehaviorItem.patch b/nms-patches/DispenseBehaviorItem.patch
index abb7b5cb..7c3cb06d 100644
--- a/nms-patches/DispenseBehaviorItem.patch
+++ b/nms-patches/DispenseBehaviorItem.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/DispenseBehaviorItem.java 2014-11-28 17:43:43.049707436 +0000
-+++ src/main/java/net/minecraft/server/DispenseBehaviorItem.java 2014-11-28 17:38:20.000000000 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/DispenseBehaviorItem.java 2015-01-04 20:42:23.769644196 +0000
++++ src/main/java/net/minecraft/server/DispenseBehaviorItem.java 2015-01-04 20:42:23.769644196 +0000
@@ -1,5 +1,10 @@
package net.minecraft.server;
@@ -55,7 +55,7 @@
+ entityitem.motY = event.getVelocity().getY();
+ entityitem.motZ = event.getVelocity().getZ();
+
-+ if (!event.getItem().equals(craftItem)) {
++ if (!event.getItem().getType().equals(craftItem.getType())) {
+ // Chain to handler for new item
+ ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
+ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.M.get(eventStack.getItem());