summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockDropper.patch
blob: 60af6a4ce4d0a6210fdaa6d4d3342493841a18e8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
--- /home/matt/mc-dev-private//net/minecraft/server/BlockDropper.java	2015-02-26 22:40:22.115608145 +0000
+++ src/main/java/net/minecraft/server/BlockDropper.java	2015-02-26 22:40:22.115608145 +0000
@@ -1,5 +1,10 @@
 package net.minecraft.server;
 
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.inventory.InventoryMoveItemEvent;
+// CraftBukkit end
+
 public class BlockDropper extends BlockDispenser {
 
     private final IDispenseBehavior P = new DispenseBehaviorItem();
@@ -14,7 +19,7 @@
         return new TileEntityDropper();
     }
 
-    protected void dispense(World world, BlockPosition blockposition) {
+    public void dispense(World world, BlockPosition blockposition) { // CraftBukkit - public
         SourceBlock sourceblock = new SourceBlock(world, blockposition);
         TileEntityDispenser tileentitydispenser = (TileEntityDispenser) sourceblock.getTileEntity();
 
@@ -38,8 +43,25 @@
                             itemstack1 = null;
                         }
                     } else {
-                        itemstack1 = TileEntityHopper.addItem(iinventory, itemstack.cloneItemStack().a(1), enumdirection.opposite());
-                        if (itemstack1 == null) {
+                        // CraftBukkit start - Fire event when pushing items into other inventories
+                        CraftItemStack oitemstack = CraftItemStack.asCraftMirror(itemstack.cloneItemStack().a(1));
+
+                        org.bukkit.inventory.Inventory destinationInventory;
+                        // Have to special case large chests as they work oddly
+                        if (iinventory instanceof InventoryLargeChest) {
+                            destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory);
+                        } else {
+                            destinationInventory = iinventory.getOwner().getInventory();
+                        }
+
+                        InventoryMoveItemEvent event = new InventoryMoveItemEvent(tileentitydispenser.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
+                        world.getServer().getPluginManager().callEvent(event);
+                        if (event.isCancelled()) {
+                            return;
+                        }
+                        itemstack1 = TileEntityHopper.addItem(iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection.opposite());
+                        if (event.getItem().equals(oitemstack) && itemstack1 == null) {
+                            // CraftBukkit end
                             itemstack1 = itemstack.cloneItemStack();
                             if (--itemstack1.count == 0) {
                                 itemstack1 = null;