diff options
| author | repo_alt <wvk17@yandex.ru> | 2021-01-25 16:55:16 +0300 |
|---|---|---|
| committer | repo_alt <wvk17@yandex.ru> | 2021-01-25 16:55:16 +0300 |
| commit | c5d03bd38fa1c5269d52d380d19a29f8a01b7284 (patch) | |
| tree | 07f9c6b6085c154ed0c518036f4c770376737832 | |
| parent | 33eb9e52a3627802143643b2d86544f24a1abd0a (diff) | |
| download | GT5-Unofficial-c5d03bd38fa1c5269d52d380d19a29f8a01b7284.tar.gz GT5-Unofficial-c5d03bd38fa1c5269d52d380d19a29f8a01b7284.tar.bz2 GT5-Unofficial-c5d03bd38fa1c5269d52d380d19a29f8a01b7284.zip | |
Drillers correctly reuse old mining pipes
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/build.properties b/build.properties index f08994658e..b1c494211b 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.34.09 +gt.version=5.09.34.10 ae2.version=rv3-beta-22 applecore.version=1.7.10-1.2.1+107.59407 buildcraft.version=7.1.11 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; |