Fix smeltery NPE on world startup

SlimeKnights · Sep 19, 2014 · 9e7eec8 · 9e7eec8
1 parent d9ae55a
commit 9e7eec8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java
@@ -720,8 +720,8 @@ public int getInventoryStackLimit ()
     @Override
     public void markDirty ()
     {
-        updateEntity();
         updateTemperatures();
+        updateEntity();
 
         super.markDirty();
         needsUpdate = true;
@@ -1212,12 +1212,12 @@ public void readFromNBT (NBTTagCompound tags)
                 moltenMetal.add(fluid);
         }
 
-        if(maxBlockCapacity != meltingTemps.length)
-            adjustLayers(layers, true);
+        //if(maxBlockCapacity != meltingTemps.length)
+          //  adjustLayers(layers, true);
 
         if(!tags.getBoolean("ValidStructure"))
             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();
 
         // adjustLayers(layers, true);