From 37bc6a07c0a6e57efd9a8e471f55d2666cd45c10 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 20 Mar 2015 17:34:11 -0500 Subject: [PATCH] Flamethrowers now use gas --- src/main/java/mekanism/client/ClientTickHandler.java | 10 ++++++++++ .../java/mekanism/common/CommonPlayerTickHandler.java | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 2b501d702..bcc188364 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -300,6 +300,16 @@ public class ClientTickHandler MekanismClient.updateKey(mc.gameSettings.keyBindJump, KeySync.ASCEND); MekanismClient.updateKey(mc.gameSettings.keyBindSneak, KeySync.DESCEND); } + + if(isFlamethrowerOn(mc.thePlayer)) + { + ItemFlamethrower flamethrower = (ItemFlamethrower)mc.thePlayer.getCurrentEquippedItem().getItem(); + + if(!mc.thePlayer.capabilities.isCreativeMode) + { + flamethrower.useGas(mc.thePlayer.getCurrentEquippedItem()); + } + } if(isJetpackOn(mc.thePlayer)) { diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 1bf3622aa..e9cf23f93 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -45,6 +45,11 @@ public class CommonPlayerTickHandler if(isFlamethrowerOn(player)) { player.worldObj.spawnEntityInWorld(new EntityFlame(player)); + + if(!player.capabilities.isCreativeMode) + { + ((ItemFlamethrower)player.getCurrentEquippedItem().getItem()).useGas(player.getCurrentEquippedItem()); + } } if(isJetpackOn(player))