aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthryan <dborrfors@gmail.com>2021-05-17 12:48:03 +0200
committerGitHub <noreply@github.com>2021-05-17 12:48:03 +0200
commit384987f36f3392596845eb3f75b6c9e042ed4cd9 (patch)
tree56eb06c52cd3d9808ec3ff13ad8fafcc7b9fb774
parente9017cd39cc8fa0dafd3190554b6af89c8d46fdc (diff)
parent4008660fd4ae7e2983e3e5e6eb08545c438900d0 (diff)
downloadGT5-Unofficial-384987f36f3392596845eb3f75b6c9e042ed4cd9.tar.gz
GT5-Unofficial-384987f36f3392596845eb3f75b6c9e042ed4cd9.tar.bz2
GT5-Unofficial-384987f36f3392596845eb3f75b6c9e042ed4cd9.zip
Merge pull request #5 from GTNewHorizons/patch-implosion-compressor
prevent resetPiston when machine not formed Former-commit-id: c2d13544019343f7b36a6045196aaca21d8622b0
-rw-r--r--build.gradle.kts4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 4cd7e8c3a7..35e7681226 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ import net.minecraftforge.gradle.user.UserExtension
buildscript {
repositories {
mavenCentral()
- maven("http://files.minecraftforge.net/maven")
+ maven("https://gregtech.overminddl1.com/")
maven("https://jitpack.io")
}
dependencies {
@@ -232,4 +232,4 @@ artifacts {
fun getVersionAppendage() : String {
return org.ajoberstar.grgit.Grgit.open(mapOf("currentDir" to project.rootDir)).log().last().abbreviatedId
-} \ No newline at end of file
+}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java
index 18e6a43ebc..8bb604dd36 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java
@@ -115,7 +115,7 @@ public class GT_TileEntity_ElectricImplosionCompressor extends GT_MetaTileEntity
private void resetPiston() {
if (this.getBaseMetaTileEntity().getWorld().isRemote)
return;
- if (!this.piston) {
+ if (!this.piston && this.mMachine) {
int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX;
int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ;
int aX = this.getBaseMetaTileEntity().getXCoord(), aY = this.getBaseMetaTileEntity().getYCoord(), aZ = this.getBaseMetaTileEntity().getZCoord();