diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-01-18 10:02:04 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-01-18 10:02:04 +0100 |
| commit | 9e28a574f62506d3a7dddbbfb49fbe755c744179 (patch) | |
| tree | 29fa9ef12357bc0e57e2f1176d275addf49c5b5a | |
| parent | 13ee7040d6b446639f64c8b6014e2f0c1a865e0c (diff) | |
| parent | 2c65fddb561a7050db240c61d20cfcb94acb5b7a (diff) | |
| download | GT5-Unofficial-9e28a574f62506d3a7dddbbfb49fbe755c744179.tar.gz GT5-Unofficial-9e28a574f62506d3a7dddbbfb49fbe755c744179.tar.bz2 GT5-Unofficial-9e28a574f62506d3a7dddbbfb49fbe755c744179.zip | |
Merge branch 'experimental' into Chest-and-Tank-2
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java | 18 |
1 files 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 14ac58c9e2..ba2aef3291 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<ItemStack> 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) { |