From 6d85b0800f9edb47598a8d3f42f673deff0f7286 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 20 Mar 2015 01:39:22 -0400 Subject: [PATCH] Fixed a Metallurgic Infuser container bug, hopefully fixed flamethrowers on SMP --- src/main/java/mekanism/client/ClientTickHandler.java | 4 ++-- .../mekanism/client/render/RenderTickHandler.java | 1 - .../java/mekanism/common/CommonPlayerTracker.java | 12 ++++++------ .../container/ContainerMetallurgicInfuser.java | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 0f34576e6..eed696491 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -217,7 +217,7 @@ public class ClientTickHandler Mekanism.flamethrowerActive.add(mc.thePlayer.getCommandSenderName()); } else { - Mekanism.flamethrowerActive.remove(mc.thePlayer); + Mekanism.flamethrowerActive.remove(mc.thePlayer.getCommandSenderName()); } Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(isFlamethrowerOn(mc.thePlayer))); @@ -281,7 +281,7 @@ public class ClientTickHandler } } - for(EntityPlayer player : (List) mc.theWorld.playerEntities) + for(EntityPlayer player : (List)mc.theWorld.playerEntities) { if(hasFlamethrower(player)) { diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 5c5906f95..7347e4cd3 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -176,7 +176,6 @@ public class RenderTickHandler if(((ItemFlamethrower)p.getCurrentEquippedItem().getItem()).getGas(p.getCurrentEquippedItem()) != null) { Pos3D playerPos = new Pos3D(p); - Pos3D flameVec = new Pos3D(); if(p.isSneaking()) diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 1e5bec166..438bd523a 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -38,17 +38,17 @@ public class CommonPlayerTracker @SubscribeEvent public void onPlayerLogoutEvent(PlayerLoggedOutEvent event) { - Mekanism.jetpackOn.remove(event.player); - Mekanism.gasmaskOn.remove(event.player); - Mekanism.flamethrowerActive.remove(event.player); + Mekanism.jetpackOn.remove(event.player.getCommandSenderName()); + Mekanism.gasmaskOn.remove(event.player.getCommandSenderName()); + Mekanism.flamethrowerActive.remove(event.player.getCommandSenderName()); } @SubscribeEvent public void onPlayerDimChangedEvent(PlayerChangedDimensionEvent event) { - Mekanism.jetpackOn.remove(event.player); - Mekanism.gasmaskOn.remove(event.player); - Mekanism.flamethrowerActive.remove(event.player); + Mekanism.jetpackOn.remove(event.player.getCommandSenderName()); + Mekanism.gasmaskOn.remove(event.player.getCommandSenderName()); + Mekanism.flamethrowerActive.remove(event.player.getCommandSenderName()); if(!event.player.worldObj.isRemote) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 88cd2cbb4..199b14bad 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -83,7 +83,7 @@ public class ContainerMetallurgicInfuser extends Container } else if(ChargeUtils.canBeDischarged(slotStack)) { - if(!mergeItemStack(slotStack, 4, 5, false)) + if(!mergeItemStack(slotStack, 0, 1, false)) { return null; }