--- a/net/minecraft/server/DispenseBehaviorBoat.java
+++ b/net/minecraft/server/DispenseBehaviorBoat.java
@@ -1,5 +1,10 @@
 package net.minecraft.server;
 
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.block.BlockDispenseEvent;
+// CraftBukkit end
+
 public class DispenseBehaviorBoat extends DispenseBehaviorItem {
 
     private final DispenseBehaviorItem b = new DispenseBehaviorItem();
@@ -29,12 +34,40 @@
             d3 = 0.0D;
         }
 
-        EntityBoat entityboat = new EntityBoat(world, d0, d1 + d3, d2);
+        // EntityBoat entityboat = new EntityBoat(world, d0, d1 + d3, d2);
+        // CraftBukkit start
+        ItemStack itemstack1 = itemstack.cloneAndSubtract(1);
+        org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
+        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
+
+        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1 + d3, d2));
+        if (!BlockDispenser.eventFired) {
+            world.getServer().getPluginManager().callEvent(event);
+        }
+
+        if (event.isCancelled()) {
+            itemstack.add(1);
+            return itemstack;
+        }
+
+        if (!event.getItem().equals(craftItem)) {
+            itemstack.add(1);
+            // Chain to handler for new item
+            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem());
+            if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != this) {
+                idispensebehavior.dispense(isourceblock, eventStack);
+                return itemstack;
+            }
+        }
+
+        EntityBoat entityboat = new EntityBoat(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ());
+        // CraftBukkit end
 
         entityboat.setType(this.c);
         entityboat.yaw = enumdirection.n();
-        world.addEntity(entityboat);
-        itemstack.subtract(1);
+        if (!world.addEntity(entityboat)) itemstack.add(1); // CraftBukkit
+        // itemstack.subtract(1); // CraftBukkit - handled during event processing
         return itemstack;
     }