diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-08-04 13:51:32 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-08-04 13:51:32 +1000 |
| commit | dba6510f507438ecf05629d3135a76f527b70bff (patch) | |
| tree | 77c7282b7cff7d12586c19f119145d950cfb7403 /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities | |
| parent | 6f5e00874b30e2dd01438dc4ada6dfff6ae4b2ce (diff) | |
| download | GT5-Unofficial-dba6510f507438ecf05629d3135a76f527b70bff.tar.gz GT5-Unofficial-dba6510f507438ecf05629d3135a76f527b70bff.tar.bz2 GT5-Unofficial-dba6510f507438ecf05629d3135a76f527b70bff.zip | |
$ Fixed Null Pointers if Tesseracts are broken too fast after placement.
% Tweaked power usage from EV -> HV.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities')
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index 313b7049e3..b017cce0db 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -115,7 +115,7 @@ extends GT_MetaTileEntity_BasicTank @Override public long maxEUInput() { - return 2048; + return 512; } @Override @@ -127,7 +127,7 @@ extends GT_MetaTileEntity_BasicTank @Override public long maxEUStore() { - return 100000; + return 512*32; } @Override @@ -211,7 +211,7 @@ extends GT_MetaTileEntity_BasicTank break; } PlayerUtils.messagePlayer(aPlayer, "Frequency: " + this.mFrequency); - PlayerUtils.messagePlayer(aPlayer, ((getGeneratorEntity() != null) && (getGeneratorEntity() != this)) ? EnumChatFormatting.RED + " (Occupied)" : ""); + PlayerUtils.messagePlayer(aPlayer, ((getGeneratorEntity(this.mFrequency) != null) && (getGeneratorEntity(this.mFrequency) != this)) ? EnumChatFormatting.RED + " (Occupied)" : ""); } return true; } @@ -236,7 +236,7 @@ extends GT_MetaTileEntity_BasicTank case 3: this.mFrequency += 512; } - GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency + ((getGeneratorEntity() != null && getGeneratorEntity() != this) ? EnumChatFormatting.RED + " (Occupied)" : "")); + GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency + ((getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) ? EnumChatFormatting.RED + " (Occupied)" : "")); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index b378654fd5..f231c21a93 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -88,7 +88,7 @@ extends GT_MetaTileEntity_BasicTank @Override public long maxEUInput() { - return 2048; + return 512; } @Override @@ -100,7 +100,7 @@ extends GT_MetaTileEntity_BasicTank @Override public long maxEUStore() { - return 100000; + return 512*32; } @Override |