From 4176f2c5252b80e40f9281cf2bc44bd0e0866822 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Sun, 4 Dec 2016 15:15:33 -1000 Subject: [PATCH] Fix Advanced Miner II occasionally outputting the wrong blocks AdvMinerII would occasionally output the drops from a block recently broken by the player. This happens when the wrong coordinates are passed to GT_Block_Ores_Abstract.getDrops(), which causes it to fail to find the TileEntity and then fall back to whatever the most recently broken block was. Fixes #751 (probably), #674, #508 --- .../multi/GT_MetaTileEntity_AdvMiner2.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java index 0fcb84c3..8d3f5cb1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java @@ -134,7 +134,8 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas } ArrayList tDrops = new ArrayList(); Block tMineBlock = null; - ChunkPosition mle = null;; + ChunkPosition mle = null; + int posX, posY, posZ, offX, offY, offZ; while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { mle = mMineList.get(0); mMineList.remove(0); @@ -142,8 +143,15 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas } if (tMineBlock!=null && tMineBlock!=Blocks.air) { - int metadata = getBaseMetaTileEntity().getMetaIDOffset(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); - boolean silkTouch = tMineBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ, metadata); + posX = mle.chunkPosX + getBaseMetaTileEntity().getXCoord(); + posY = mle.chunkPosY + getBaseMetaTileEntity().getYCoord(); + posZ = mle.chunkPosZ + getBaseMetaTileEntity().getZCoord(); + offX = mle.chunkPosX; + offY = mle.chunkPosY; + offZ = mle.chunkPosZ; + + int metadata = getBaseMetaTileEntity().getMetaIDOffset(offX, offY, offZ); + boolean silkTouch = tMineBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, posX, posY, posZ, metadata); if (silkTouch){ ItemStack IS = new ItemStack(tMineBlock); IS.setItemDamage(metadata); @@ -151,10 +159,10 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas tDrops.add(IS); } else{ - tDrops = tMineBlock.getDrops(getBaseMetaTileEntity().getWorld(), mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ, metadata, 1); + tDrops = tMineBlock.getDrops(getBaseMetaTileEntity().getWorld(), posX, posY, posZ, metadata, 1); } - getBaseMetaTileEntity().getWorld().setBlockToAir(mle.chunkPosX + getBaseMetaTileEntity().getXCoord(), mle.chunkPosY + getBaseMetaTileEntity().getYCoord(), mle.chunkPosZ + getBaseMetaTileEntity().getZCoord()); + getBaseMetaTileEntity().getWorld().setBlockToAir(posX, posY, posZ); if (!tDrops.isEmpty()) { ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy()); if (tData.mPrefix != OrePrefixes.crushed && tData.mMaterial.mMaterial != Materials.Oilsands) {