aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-06-07 09:30:04 +0200
committerGitHub <noreply@github.com>2017-06-07 09:30:04 +0200
commit3b1f55fcb95110311f68f2bb4b0b9247ce2e074f (patch)
tree06c5f3b625d3d2d4dc99637f25ac5a9eb21f220e /src/main/java/gregtech/api
parent425a6d1cea35084a3f68c14224d842b8d0b0e2ad (diff)
parent64a69695e5b7c2eaa06624a5f41a950c0e2ce6c7 (diff)
downloadGT5-Unofficial-3b1f55fcb95110311f68f2bb4b0b9247ce2e074f.tar.gz
GT5-Unofficial-3b1f55fcb95110311f68f2bb4b0b9247ce2e074f.tar.bz2
GT5-Unofficial-3b1f55fcb95110311f68f2bb4b0b9247ce2e074f.zip
Merge pull request #1076 from vlad20012/int-overflow-fix
Fixed stored energy integer overflow
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 8dd8eefe7e..fc46874480 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -167,8 +167,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
} else {
if (aID <= 0) mID = (short) aNBT.getInteger("mID");
else mID = aID;
- mStoredSteam = aNBT.getInteger("mStoredSteam");
- mStoredEnergy = aNBT.getInteger("mStoredEnergy");
+ mStoredSteam = aNBT.getLong("mStoredSteam");
+ mStoredEnergy = aNBT.getLong("mStoredEnergy");
mColor = aNBT.getByte("mColor");
mLightValue = aNBT.getByte("mLightValue");
mWorkData = aNBT.getByte("mWorkData");