Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #782 from codewarrior0/advminer-fix

Browse source 
Fix Advanced Miner II occasionally outputting the wrong blocks
This commit is contained in:
Blood-Asp 2016-12-07 22:06:17 +01:00 committed by GitHub
commit 0c4e3cbd09
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
View file

@ -134,7 +134,8 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas
} }
ArrayList<ItemStack> tDrops = new ArrayList(); ArrayList<ItemStack> tDrops = new ArrayList();
Block tMineBlock = null; Block tMineBlock = null;
ChunkPosition mle = null;; ChunkPosition mle = null;
int posX, posY, posZ, offX, offY, offZ;
while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) {
mle = mMineList.get(0); mle = mMineList.get(0);
mMineList.remove(0); mMineList.remove(0);
@ -142,8 +143,15 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas
} }
if (tMineBlock!=null && tMineBlock!=Blocks.air) { if (tMineBlock!=null && tMineBlock!=Blocks.air) {
int metadata = getBaseMetaTileEntity().getMetaIDOffset(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); posX = mle.chunkPosX + getBaseMetaTileEntity().getXCoord();
boolean silkTouch = tMineBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ, metadata); 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){ if (silkTouch){
ItemStack IS = new ItemStack(tMineBlock); ItemStack IS = new ItemStack(tMineBlock);
IS.setItemDamage(metadata); IS.setItemDamage(metadata);
@ -151,10 +159,10 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas
tDrops.add(IS); tDrops.add(IS);
} }
else{ 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()) { if (!tDrops.isEmpty()) {
ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy()); ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy());
if (tData.mPrefix != OrePrefixes.crushed && tData.mMaterial.mMaterial != Materials.Oilsands) { if (tData.mPrefix != OrePrefixes.crushed && tData.mMaterial.mMaterial != Materials.Oilsands) {