aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces/tileentity
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2016-09-05 19:31:54 +0200
committerTechnus <daniel112092@gmail.com>2016-09-21 22:02:51 +0200
commitd09a81b50186cb198fad5320574db98be57d1d5c (patch)
treea7cf7e50f0d15b8bcb3fc525e4f11f5cc7407109 /src/main/java/gregtech/api/interfaces/tileentity
parentfcae1a1801296af53761c9a04dce89d35e235fbe (diff)
downloadGT5-Unofficial-d09a81b50186cb198fad5320574db98be57d1d5c.tar.gz
GT5-Unofficial-d09a81b50186cb198fad5320574db98be57d1d5c.tar.bz2
GT5-Unofficial-d09a81b50186cb198fad5320574db98be57d1d5c.zip
EVEN MORE WORK
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/tileentity')
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index 750c207aad..7c4ef1af49 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -71,14 +71,13 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
}
} else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) {
ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
- long rfOUT = aVoltage * GregTech_API.mEUtoRF / 100;
- int rfOut = rfOUT>Integer.MAX_VALUE ? Integer.MAX_VALUE : (int)rfOUT;
+ int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100);
if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) {
((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false);
rUsedAmperes++;
}
- if (GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions && ((IEnergyReceiver) tTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600) {
- if (rfOut > 32 * GregTech_API.mEUtoRF / 100) {
+ if (GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions && ((IEnergyReceiver) tTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600L) {
+ if (rfOut > 32L * GregTech_API.mEUtoRF / 100L) {
int aExplosionPower = rfOut;
float tStrength =
aExplosionPower < V[0] ? 1.0F :