diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-01-18 12:24:45 +0100 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-01-18 12:24:45 +0100 |
| commit | df489f30891290c5f1e94b3b10699d8c529d5522 (patch) | |
| tree | d223fb94b83927e1b83e83452ccc3016925143cc | |
| parent | 0c1d0d82bc3700e063a51a90c8d4d88b5c81a074 (diff) | |
| download | GT5-Unofficial-df489f30891290c5f1e94b3b10699d8c529d5522.tar.gz GT5-Unofficial-df489f30891290c5f1e94b3b10699d8c529d5522.tar.bz2 GT5-Unofficial-df489f30891290c5f1e94b3b10699d8c529d5522.zip | |
Fixed air offset for multis
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Former-commit-id: 7618e9883cfe006ca1855a3b1aa8feb4c76b759e
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build.properties b/build.properties index 0480826dbd..5d372d6798 100644 --- a/build.properties +++ b/build.properties @@ -22,7 +22,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=5 -buildNumber=9 +buildNumber=10 APIVersion=8 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java index 24194ff563..cbeede008f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java @@ -490,7 +490,7 @@ public class BW_Util { continue; boolean b = Math.abs(x) < radius && Math.abs(z) != radius; if (insideCheck && b) { - if (! (inside.equals(Blocks.air) ? aBaseMetaTileEntity.getAir(xDir + x, y, zDir + z) : aBaseMetaTileEntity.getBlockOffset(xDir + x, y, zDir + z).equals(inside) ) && (aBaseMetaTileEntity.getMetaIDOffset(xDir + x, y, zDir + z) != dmginside || dmginside > (-1))) { + if (! (inside.equals(Blocks.air) ? aBaseMetaTileEntity.getAirOffset(xDir + x, y, zDir + z) : aBaseMetaTileEntity.getBlockOffset(xDir + x, y, zDir + z).equals(inside) ) && (aBaseMetaTileEntity.getMetaIDOffset(xDir + x, y, zDir + z) != dmginside || dmginside > (-1))) { if (!(allowHatches && ( ((GT_MetaTileEntity_MultiBlockBase) aBaseMetaTileEntity.getMetaTileEntity()).addDynamoToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, y, zDir + z), aBaseCasingIndex) || ((GT_MetaTileEntity_MultiBlockBase) aBaseMetaTileEntity.getMetaTileEntity()).addEnergyInputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, y, zDir + z), aBaseCasingIndex) || |