diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-01-26 17:20:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 17:20:18 +0100 |
| commit | bc7ce8e5a6a9a2146fa61f0c0a09b83ecec4cf66 (patch) | |
| tree | 87486b455bacb4927e1cb38bb9880e658850eb79 /src/main/java/gregtech/common | |
| parent | c2cae998cdaf3542d937c08fe491ea4f7d1662bd (diff) | |
| parent | c5d03bd38fa1c5269d52d380d19a29f8a01b7284 (diff) | |
| download | GT5-Unofficial-bc7ce8e5a6a9a2146fa61f0c0a09b83ecec4cf66.tar.gz GT5-Unofficial-bc7ce8e5a6a9a2146fa61f0c0a09b83ecec4cf66.tar.bz2 GT5-Unofficial-bc7ce8e5a6a9a2146fa61f0c0a09b83ecec4cf66.zip | |
Merge pull request #420 from repo-alt/experimental
Drillers correctly reuse old mining pipes
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index b480f4f5a6..68770644de 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -168,10 +168,14 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu case 2: return 3; } - if (!GT_Utility.setBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), xPipe, yHead - 1, zPipe, miningPipeTipBlock, 0, isSimulating)) return 3; + Block b = getBaseMetaTileEntity().getBlock(xPipe, yHead - 1, zPipe); + if (b != miningPipeTipBlock && !GT_Utility.setBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), xPipe, yHead - 1, zPipe, miningPipeTipBlock, 0, isSimulating)) + return 3; if (!isSimulating) { - if (yHead != yDrill) getBaseMetaTileEntity().getWorld().setBlock(xPipe, yHead, zPipe, miningPipeBlock); - getBaseMetaTileEntity().decrStackSize(1, 1); + if (yHead != yDrill) + getBaseMetaTileEntity().getWorld().setBlock(xPipe, yHead, zPipe, miningPipeBlock); + if (b != miningPipeBlock && b != miningPipeTipBlock) + getBaseMetaTileEntity().decrStackSize(1, 1); } return 0; |