diff options
| author | Techlone <techlone.mc@gmail.com> | 2017-06-04 21:31:08 +0500 |
|---|---|---|
| committer | Techlone <techlone.mc@gmail.com> | 2017-06-04 21:31:08 +0500 |
| commit | 5df32b69abfa1071fabc6c8a1864ca1fa918e123 (patch) | |
| tree | 3d0f5ef9fd6073f96bc1c6ad4920d70b76274b0b /src/main/java/gregtech/common/tileentities/machines/basic | |
| parent | c5402ee38998cc086ceb36fbce6c54aba6d9d79c (diff) | |
| parent | dbd2f5800886a36dbe4528aabfb2b30f1e7b0908 (diff) | |
| download | GT5-Unofficial-5df32b69abfa1071fabc6c8a1864ca1fa918e123.tar.gz GT5-Unofficial-5df32b69abfa1071fabc6c8a1864ca1fa918e123.tar.bz2 GT5-Unofficial-5df32b69abfa1071fabc6c8a1864ca1fa918e123.zip | |
Merge branch 'unstable' into advminer2_improvements
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java index a60ed1daed..859dd0a6e1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java @@ -111,7 +111,8 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt mPassiveEnergyUse = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.PassiveEnergy", true); } - public void onFirstTick() { + @Override + public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { if (getBaseMetaTileEntity().isServerSide()) { if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0)) { this.mTargetX = getBaseMetaTileEntity().getXCoord(); 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 a834e48db7..aa4e5645a0 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 @@ -205,7 +205,8 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { sFPowerMultiplyer = sPowerMultiplyer / 100.0; } - public void onFirstTick() { + @Override + public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { if (getBaseMetaTileEntity().isServerSide()) { if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0)) { this.mTargetX = getBaseMetaTileEntity().getXCoord(); |