From 8f1b1deb12809764a874362523292617595ef36c Mon Sep 17 00:00:00 2001 From: Kotl-EV <74097230+Kotl-EV@users.noreply.github.com> Date: Wed, 13 Jul 2022 19:32:09 +0300 Subject: [PATCH] fix dupe barell, hopper and dolly --- .../betterbarrels/common/blocks/TileEntityBarrel.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/mcp/mobius/betterbarrels/common/blocks/TileEntityBarrel.java b/src/main/java/mcp/mobius/betterbarrels/common/blocks/TileEntityBarrel.java index 1b1c140..5e4bd65 100644 --- a/src/main/java/mcp/mobius/betterbarrels/common/blocks/TileEntityBarrel.java +++ b/src/main/java/mcp/mobius/betterbarrels/common/blocks/TileEntityBarrel.java @@ -669,9 +669,10 @@ public ItemStack getStackInSlot(int islot) { public ItemStack decrStackSize(int islot, int quantity) { TileEntity ent = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); ItemStack stack; - if (ent instanceof TileEntityHopper) { + //TODO Kotl Remove Code fix dupe + /*if (ent instanceof TileEntityHopper) { stack = this.getStorage().decrStackSize_Hopper(islot, quantity); - } else if (ent == null) { // not a tile ent, check if a minecart hopper + } else */ if (ent == null) { // not a tile ent, check if a minecart hopper if (aabbBlockBelow == null) { aabbBlockBelow = AxisAlignedBB.getBoundingBox(xCoord, yCoord - 1, zCoord, xCoord + 1, yCoord, zCoord + 1); } @@ -680,9 +681,9 @@ public ItemStack decrStackSize(int islot, int quantity) { stack = this.getStorage().decrStackSize_Hopper(islot, quantity); } else { // not a minecart hopper, assume something else... - stack = this.getStorage().decrStackSize(islot, quantity); + stack = this.getStorage().decrStackSize(islot, quantity); } - } else { // at this point we know there is a valid tile below, and it's not a hopper + } else { // at this point we know there is a valid tile below, and it's not a hopper stack = this.getStorage().decrStackSize(islot, quantity); }