diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-06-19 17:09:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-19 17:09:18 +0200 |
commit | 7995774b969b2375c3e53b68cd8c3d222903aba0 (patch) | |
tree | 75e3e0b2bff5fb7ad5a50d738556bf36b072a151 /src/main | |
parent | dc2a48259afed8b86f99fa91dbf58520741e9f47 (diff) | |
parent | ef23dc90b2be6b7cb5ed57e3fa86b3904286f541 (diff) | |
download | GT5-Unofficial-7995774b969b2375c3e53b68cd8c3d222903aba0.tar.gz GT5-Unofficial-7995774b969b2375c3e53b68cd8c3d222903aba0.tar.bz2 GT5-Unofficial-7995774b969b2375c3e53b68cd8c3d222903aba0.zip |
Merge pull request #533 from Techlone/fix-adv-miner-ii-exploit
Fix adv miner ii exploit
I hope this really works.
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java | 8 |
1 files changed, 4 insertions, 4 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 e9cc7b34c7..d1b74e4381 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 @@ -30,7 +30,7 @@ import java.util.ArrayList; public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBase { - public ArrayList<ChunkPosition> mMineList = new ArrayList(); + private final ArrayList<ChunkPosition> mMineList = new ArrayList(); private boolean completedCycle = false; public GT_MetaTileEntity_AdvMiner2(int aID, String aName, String aNameRegional) { @@ -122,8 +122,8 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas } ArrayList<ItemStack> tDrops = new ArrayList(); if (!mMineList.isEmpty()) { - Block tMineBlock = getBaseMetaTileEntity().getBlockOffset(mMineList.get(0).chunkPosX, mMineList.get(0).chunkPosY, mMineList.get(0).chunkPosZ); - tDrops = tMineBlock.getDrops(getBaseMetaTileEntity().getWorld(), mMineList.get(0).chunkPosX, mMineList.get(0).chunkPosY, mMineList.get(0).chunkPosZ, getBaseMetaTileEntity().getMetaIDOffset(mMineList.get(0).chunkPosX, mMineList.get(0).chunkPosY, mMineList.get(0).chunkPosZ), 1); + ChunkPosition oreBlockOffsetPos = mMineList.get(0); + tDrops = ((GT_TileEntity_Ores) getBaseMetaTileEntity().getTileEntityOffset(oreBlockOffsetPos.chunkPosX, oreBlockOffsetPos.chunkPosY, oreBlockOffsetPos.chunkPosZ)).getDrops(1); if (!tDrops.isEmpty()) { ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy()); if (tData.mPrefix != OrePrefixes.crushed&& tData.mMaterial.mMaterial != Materials.Oilsands) { @@ -145,7 +145,7 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas mOutputItems = tStack; } } - getBaseMetaTileEntity().getWorld().setBlockToAir(mMineList.get(0).chunkPosX + getBaseMetaTileEntity().getXCoord(), mMineList.get(0).chunkPosY + getBaseMetaTileEntity().getYCoord(), mMineList.get(0).chunkPosZ + getBaseMetaTileEntity().getZCoord()); + getBaseMetaTileEntity().getWorld().setBlockToAir(oreBlockOffsetPos.chunkPosX + getBaseMetaTileEntity().getXCoord(), oreBlockOffsetPos.chunkPosY + getBaseMetaTileEntity().getYCoord(), oreBlockOffsetPos.chunkPosZ + getBaseMetaTileEntity().getZCoord()); mMineList.remove(0); } } |