Fix Smelteries evaporating liquids when doing alloys at full capacity…

…. Also small fix for fuel displays not working sometimes.
SlimeKnights · Sep 16, 2014 · 99cb5e8 · 99cb5e8
1 parent da99630
commit 99cb5e8
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java
@@ -181,9 +181,7 @@ void adjustLayers (int lay, boolean forceAdjust)
         }
 
         // update current liquid. This is done in case some config or something changed the capacity or other things.
-        currentLiquid = 0;
-        for(FluidStack liquid : moltenMetal)
-            currentLiquid += liquid.amount;
+        updateCurrentLiquid();
     }
 
     /* Misc */
@@ -501,6 +499,9 @@ boolean addMoltenMetal (FluidStack liquid, boolean first)
         }
         else
         {
+            // update liquid amount..
+            updateCurrentLiquid();
+
             if (liquid.amount + currentLiquid > maxLiquid)
                 return false;
 
@@ -534,6 +535,12 @@ boolean addMoltenMetal (FluidStack liquid, boolean first)
         }
     }
 
+    private void updateCurrentLiquid() {
+        currentLiquid = 0;
+        for(FluidStack liquid : moltenMetal)
+            currentLiquid += liquid.amount;
+    }
+
     private void updateTemperatures ()
     {
         inUse = true;
@@ -587,6 +594,8 @@ public void updateFuelDisplay ()
 
     public void updateFuelGague ()
     {
+        if(activeLavaTank == null)
+            activeLavaTank = lavaTanks.get(0);
         if (activeLavaTank == null || useTime > 0)
             return;
 
@@ -714,6 +723,7 @@ public void markDirty ()
     {
         updateTemperatures();
         updateEntity();
+
         super.markDirty();
         needsUpdate = true;
         // worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
@@ -1069,8 +1079,8 @@ public FluidStack drain (int maxDrain, boolean doDrain)
                     // liquid = null;
                     moltenMetal.remove(liquid);
                     worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
-                    currentLiquid = 0;
                     needsUpdate = true;
+                    updateCurrentLiquid();
                 }
                 return liq;
             }