Fix smeltery NPE on world startup

This commit is contained in:
Bernhard Bonigl committed 2014-09-19 09:01:02 +02:00
1 parent d9ae55a42a
commit 9e7eec8215
1 file changed
+4 -4
@@ -720,8 +720,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
@Override @Override
public void markDirty () public void markDirty ()
{ {
updateEntity();
updateTemperatures(); updateTemperatures();
updateEntity();
super.markDirty(); super.markDirty();
needsUpdate = true; needsUpdate = true;
@@ -1212,12 +1212,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
moltenMetal.add(fluid); moltenMetal.add(fluid);
} }
if(maxBlockCapacity != meltingTemps.length) //if(maxBlockCapacity != meltingTemps.length)
adjustLayers(layers, true); // adjustLayers(layers, true);
if(!tags.getBoolean("ValidStructure")) if(!tags.getBoolean("ValidStructure"))
validStructure = false; // only negative update because we want to do a clientside structure check too validStructure = false; // only negative update because we want to do a clientside structure check too
else if(!validStructure) else if(!validStructure && worldObj != null) // if the worldobj is null it happens on loading of a world. check shouldn't be done there
checkValidPlacement(); checkValidPlacement();
// adjustLayers(layers, true); // adjustLayers(layers, true);