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

Fixed Gas Masks not working

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-22 21:53:00 -04:00
parent 4354357462
commit 62be3523d7
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/client/ClientTickHandler.java
View file

@ -357,7 +357,7 @@ public class ClientTickHandler
final int max = 300;
tank.useGas(mc.thePlayer.getEquipmentInSlot(3));
GasStack received = tank.removeGas(mc.thePlayer.getEquipmentInSlot(3), max-mc.thePlayer.getAir());
GasStack received = tank.useGas(mc.thePlayer.getEquipmentInSlot(3), max-mc.thePlayer.getAir());
if(received != null)
{

2
src/main/java/mekanism/common/CommonPlayerTickHandler.java
View file

@ -102,7 +102,7 @@ public class CommonPlayerTickHandler
final int max = 300;
tank.useGas(player.getEquipmentInSlot(3));
GasStack received = tank.removeGas(player.getEquipmentInSlot(3), max-player.getAir());
GasStack received = tank.useGas(player.getEquipmentInSlot(3), max-player.getAir());
if(received != null)
{

19
src/main/java/mekanism/common/item/ItemScubaTank.java
View file

@ -75,9 +75,24 @@ public class ItemScubaTank extends ItemArmor implements IGasItem
return model;
}
public void useGas(ItemStack stack)
public void useGas(ItemStack itemstack)
{
setGas(stack, new GasStack(getGas(stack).getGas(), getGas(stack).amount-1));
setGas(itemstack, new GasStack(getGas(itemstack).getGas(), getGas(itemstack).amount-1));
}
public GasStack useGas(ItemStack itemstack, int amount)
{
if(getGas(itemstack) == null)
{
return null;
}
Gas type = getGas(itemstack).getGas();
int gasToUse = Math.min(getStored(itemstack), Math.min(getRate(itemstack), amount));
setGas(itemstack, new GasStack(type, getStored(itemstack)-gasToUse));
return new GasStack(type, gasToUse);
}
@Override