2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/BlockDropper.java
|
|
|
|
|
+++ b/net/minecraft/server/BlockDropper.java
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -1,5 +1,10 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
|
|
|
+import org.bukkit.event.inventory.InventoryMoveItemEvent;
|
|
|
|
|
+// CraftBukkit end
|
2016-11-17 02:41:03 +01:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
public class BlockDropper extends BlockDispenser {
|
|
|
|
|
|
2018-07-15 02:00:00 +02:00
|
|
|
private static final IDispenseBehavior c = new DispenseBehaviorItem();
|
|
|
|
|
@@ -34,8 +39,25 @@
|
|
|
|
|
if (iinventory == null) {
|
|
|
|
|
itemstack1 = BlockDropper.c.dispense(sourceblock, itemstack);
|
|
|
|
|
} else {
|
|
|
|
|
- itemstack1 = TileEntityHopper.addItem(tileentitydispenser, iinventory, itemstack.cloneItemStack().cloneAndSubtract(1), enumdirection.opposite());
|
|
|
|
|
- if (itemstack1.isEmpty()) {
|
|
|
|
|
+ // CraftBukkit start - Fire event when pushing items into other inventories
|
|
|
|
|
+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(itemstack.cloneItemStack().cloneAndSubtract(1));
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
2018-07-15 02:00:00 +02:00
|
|
|
+ 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();
|
|
|
|
|
+ }
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
2018-07-15 02:00:00 +02:00
|
|
|
+ InventoryMoveItemEvent event = new InventoryMoveItemEvent(tileentitydispenser.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
|
|
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ itemstack1 = TileEntityHopper.addItem(tileentitydispenser, iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection.opposite());
|
|
|
|
|
+ if (event.getItem().equals(oitemstack) && itemstack1.isEmpty()) {
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
itemstack1 = itemstack.cloneItemStack();
|
|
|
|
|
itemstack1.subtract(1);
|
|
|
|
|
} else {
|
