From 62be3523d7a5d8c1f35eb753ed362ef7b120ef8b Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sun, 22 Mar 2015 21:53:00 -0400 Subject: [PATCH] Fixed Gas Masks not working --- .../mekanism/client/ClientTickHandler.java | 2 +- .../common/CommonPlayerTickHandler.java | 2 +- .../mekanism/common/item/ItemScubaTank.java | 19 +++++++++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index bcc188364..8ffd31515 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -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) { diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index e9cf23f93..679bb311e 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -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) { diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 09aa6f1aa..f524c49e7 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -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