Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix NPE when worldObj is null while reading NBT

Browse source
This commit is contained in:
Krapht 2012-07-05 17:36:41 +02:00
parent 5458dde84f
commit cadd088f0b
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/net/minecraft/src/buildcraft/factory/TileQuarry.java
View file

@ -70,6 +70,8 @@ public class TileQuarry extends TileMachine implements IArmListener, IMachine, I
public @TileNetworkData PowerProvider powerProvider;
public static int MAX_ENERGY = 7000;
NBTTagCompound armStore = null;
public TileQuarry() {
@ -95,7 +97,16 @@ public class TileQuarry extends TileMachine implements IArmListener, IMachine, I
if (builderDone) {
box.deleteLasers();
if (armStore != null){
arm = new EntityMechanicalArm(worldObj);
arm.readFromNBT(armStore);
arm.listener = this;
loadArm = true;
armStore = null;
}
if (arm == null) {
createArm();
}
@ -332,12 +343,7 @@ public class TileQuarry extends TileMachine implements IArmListener, IMachine, I
targetZ = nbttagcompound.getInteger("targetZ");
if (nbttagcompound.getBoolean("hasArm")) {
NBTTagCompound armStore = nbttagcompound.getCompoundTag("arm");
arm = new EntityMechanicalArm(worldObj);
arm.readFromNBT(armStore);
arm.listener = this;
loadArm = true;
armStore = nbttagcompound.getCompoundTag("arm");
}
}