diff --git a/src/main/java/mekanism/client/model/ModelPortableTank.java b/src/main/java/mekanism/client/model/ModelPortableTank.java index 9e4ca8367..3bdcb45af 100644 --- a/src/main/java/mekanism/client/model/ModelPortableTank.java +++ b/src/main/java/mekanism/client/model/ModelPortableTank.java @@ -1,5 +1,6 @@ package mekanism.client.model; +import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; @@ -94,10 +95,13 @@ public class ModelPortableTank extends ModelBase PoleBR.render(size); PoleRF.render(size); Top.render(size); + + MekanismRenderer.blendOn(); FrontGlass.render(size); BackGlass.render(size); RightGlass.render(size); LeftGlass.render(size); + MekanismRenderer.blendOff(); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java index d86cd7c4d..92a7684f1 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java @@ -43,7 +43,7 @@ public class RenderPortableTank extends TileEntitySpecialRenderer public void render(Fluid fluid, float fluidScale, boolean active, double x, double y, double z) { - if(fluidScale > 0) + if(fluid != null && fluidScale > 0) { push(); @@ -80,7 +80,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer private void pop() { GL11.glPopAttrib(); - MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); GL11.glPopMatrix(); } @@ -91,7 +90,6 @@ public class RenderPortableTank extends TileEntitySpecialRenderer GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_LIGHTING); - MekanismRenderer.glowOn(); MekanismRenderer.blendOn(); } diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 6190fb0e5..5df6a019a 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -350,8 +350,9 @@ public class EnergyNetwork extends DynamicNetwork } } - if (networkChanged) { - this.updateCapacity(); + if(networkChanged) + { + updateCapacity(); } needsUpdate = true;