tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix a few bugs

Browse source
This commit is contained in:
Aidan Brady 2013-12-17 13:23:29 -05:00
parent 4e74995143
commit a3529a12d7
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/api/gas/GasNetwork.java
View file

@ -342,7 +342,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
public float getScale() public float getScale()
{ {
return (gasStored == null || getCapacity() == 0 ? 0 : gasStored.amount/getCapacity()); return (gasStored == null || getCapacity() == 0 ? 0 : (float)gasStored.amount/getCapacity());
} }
@Override @Override

7
common/mekanism/client/render/RenderTickHandler.java
View file

@ -1,7 +1,9 @@
package mekanism.client.render; package mekanism.client.render;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet;
import java.util.Random; import java.util.Random;
import java.util.Set;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.Object3D; import mekanism.api.Object3D;
@ -9,7 +11,6 @@ import mekanism.common.Mekanism;
import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack;
import mekanism.common.item.ItemScubaTank; import mekanism.common.item.ItemScubaTank;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.ScaledResolution;
@ -102,7 +103,9 @@ public class RenderTickHandler implements ITickHandler
} }
} }
for(String s : Mekanism.jetpackOn) Set<String> copy = (Set)((HashSet)Mekanism.jetpackOn).clone();
for(String s : copy)
{ {
EntityPlayer p = mc.theWorld.getPlayerEntityByName(s); EntityPlayer p = mc.theWorld.getPlayerEntityByName(s);

2
common/mekanism/common/FluidNetwork.java
View file

@ -348,7 +348,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
public float getScale() public float getScale()
{ {
return (fluidStored == null || getCapacity() == 0 ? 0 : fluidStored.amount/getCapacity()); return (fluidStored == null || getCapacity() == 0 ? 0 : (float)fluidStored.amount/getCapacity());
} }
@Override @Override