diff options
| author | md_5 <git@md-5.net> | 2015-07-30 16:56:52 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-07-30 17:13:35 +1000 |
| commit | 9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e (patch) | |
| tree | 419daa22a7b957617c86aae6a4d26098f2157995 /nms-patches/BlockDropper.patch | |
| parent | de5c26123fcb6294e77ec916d91635c3f18982ee (diff) | |
| download | craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.gz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.lz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.xz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.zip | |
Update for minor remapping changes.
Diffstat (limited to 'nms-patches/BlockDropper.patch')
| -rw-r--r-- | nms-patches/BlockDropper.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/nms-patches/BlockDropper.patch b/nms-patches/BlockDropper.patch index 56952524..9f4ff914 100644 --- a/nms-patches/BlockDropper.patch +++ b/nms-patches/BlockDropper.patch @@ -11,23 +11,14 @@ 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()); +- itemstack1 = TileEntityHopper.addItem(iinventory, itemstack.cloneItemStack().cloneAndSubtract(1), enumdirection.opposite()); - if (itemstack1 == null) { + // CraftBukkit start - Fire event when pushing items into other inventories -+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(itemstack.cloneItemStack().a(1)); ++ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(itemstack.cloneItemStack().cloneAndSubtract(1)); + + org.bukkit.inventory.Inventory destinationInventory; + // Have to special case large chests as they work oddly |