aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2020-01-02 21:45:46 +0100
committerGitHub <noreply@github.com>2020-01-02 21:45:46 +0100
commitbb86e392220e8cbc85cc932548064d6db59120e2 (patch)
tree9f7ad0ccbb595b8480d9ab71717073fc77e436e9 /src
parent0feee908f137bd8cc149f4b0c69782f8ac55be39 (diff)
parentc0770c0fbad9010ef564ad8da66d6b815fd4c4f9 (diff)
downloadGT5-Unofficial-bb86e392220e8cbc85cc932548064d6db59120e2.tar.gz
GT5-Unofficial-bb86e392220e8cbc85cc932548064d6db59120e2.tar.bz2
GT5-Unofficial-bb86e392220e8cbc85cc932548064d6db59120e2.zip
Merge pull request #229 from repo-alt/feature/OilDrillRadiusFix
Oil drills in the world will have radius reset to 0 after the update …
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index bf11df1b7c..d5c4d6a482 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -90,7 +90,8 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
public void loadNBTData(NBTTagCompound aNBT) {
super.loadNBTData(aNBT);
this.wasPumping = aNBT.getBoolean("wasPumping");
- this.radiusConfig = aNBT.getInteger("radiusConfig");
+ if (aNBT.hasKey("radiusConfig"))
+ this.radiusConfig = aNBT.getInteger("radiusConfig");
this.mPrimaryPumpedBlock = Block.getBlockFromName(aNBT.getString("mPumpedBlock1"));
this.mSecondaryPumpedBlock = Block.getBlockFromName(aNBT.getString("mPumpedBlock2"));