Use correct itemstack for dispenser behavior chaining. Fixes BUKKIT-2886

When an event changes the item to be dispensed we check to see if the new
item has special behavior for dispensing and if so pass it on to that
behavior handler. However, we are actually checking the old itemstack and
passing the new itemstack so this check fails.

1 files changed, 7 insertions, 16 deletions

diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
index 9cf23dd9..1337fefe 100644
--- a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
+++ b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
@@ -65,30 +65,21 @@ public class DispenseBehaviorItem implements IDispenseBehavior {
         entityitem.motX = event.getVelocity().getX();
         entityitem.motY = event.getVelocity().getY();
         entityitem.motZ = event.getVelocity().getZ();
-        // CraftBukkit end
-
-        world.addEntity(entityitem);
 
-        // CraftBukkit start
         if (!event.getItem().equals(bukkitItem)) {
-            if (event.getItem().getTypeId() == Item.BUCKET.id) {
-                int x = isourceblock.getBlockX() + enumfacing.c();
-                int y = isourceblock.getBlockY();
-                int z = isourceblock.getBlockZ() + enumfacing.e();
-                Material material = world.getMaterial(x, y, z);
-                int data = world.getData(x, y, z);
-                if (!(Material.WATER.equals(material) || Material.LAVA.equals(material)) || data != 0) {
-                    return true;
-                }
-            }
             // Chain to handler for new item
-            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.a.a(itemstack.getItem());
+            ItemStack eventStack = CraftItemStack.createNMSItemStack(event.getItem());
+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.a.a(eventStack.getItem());
             if (idispensebehavior != IDispenseBehavior.a && idispensebehavior.getClass() != DispenseBehaviorItem.class) {
-                idispensebehavior.a(isourceblock, CraftItemStack.createNMSItemStack(event.getItem()));
+                idispensebehavior.a(isourceblock, eventStack);
+            } else {
+                world.addEntity(entityitem);
             }
             return false;
         }
 
+        world.addEntity(entityitem);
+
         return true;
         // CraftBukkit end
     }