diff options
| author | Technus <daniel112092@gmail.com> | 2017-03-03 16:01:10 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-03-03 16:01:10 +0100 |
| commit | 8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a (patch) | |
| tree | 698983182a71d2cd028aae765b040f7c84ab0d74 /src/main/java/gregtech/common/tileentities | |
| parent | 68202491c6247d64fe1559552857b527c4d16d2e (diff) | |
| parent | 5932e76f836b8bb023c66e21f3b11058abd497eb (diff) | |
| download | GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.tar.gz GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.tar.bz2 GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.zip | |
Merge not EM related stuff from branch 'eM' into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index 040b8480d3..8404315141 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -46,7 +46,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { public int mTargetX = 0; public int mTargetY = 0; public int mTargetZ = 0; - public int mTargetD = 0; + public int mTargetD = Integer.MIN_VALUE; public boolean mDebug = false; public GT_MetaTileEntity_Teleporter(int aID, String aName, String aNameRegional, int aTier) { @@ -204,13 +204,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { @Override public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { - if (aBaseMetaTileEntity.isServerSide()) { - if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0)) { - this.mTargetX = aBaseMetaTileEntity.getXCoord(); - this.mTargetY = aBaseMetaTileEntity.getYCoord(); - this.mTargetZ = aBaseMetaTileEntity.getZCoord(); - this.mTargetD = aBaseMetaTileEntity.getWorld().provider.dimensionId; - } + if (aBaseMetaTileEntity.isServerSide() && (this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == Integer.MIN_VALUE)) { + this.mTargetX = aBaseMetaTileEntity.getXCoord(); + this.mTargetY = aBaseMetaTileEntity.getYCoord(); + this.mTargetZ = aBaseMetaTileEntity.getZCoord(); + this.mTargetD = aBaseMetaTileEntity.getWorld().provider.dimensionId; } } diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java index 5e892e79e6..93611904b7 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java @@ -44,7 +44,7 @@ public class GT_MetaTileEntity_Locker public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{this.mTextures[2][(aColorIndex + 1)][0], this.mTextures[2][(aColorIndex + 1)][1], Textures.BlockIcons.LOCKERS[java.lang.Math.abs(this.mType % Textures.BlockIcons.LOCKERS.length)]}; + return new ITexture[]{this.mTextures[2][(aColorIndex + 1)][0], this.mTextures[2][(aColorIndex + 1)][1], Textures.BlockIcons.LOCKERS[Math.abs(this.mType % Textures.BlockIcons.LOCKERS.length)]}; } return this.mTextures[0][(aColorIndex + 1)]; } |