Fixed a Metallurgic Infuser container bug, hopefully fixed flamethrowers on SMP
This commit is contained in:
parent
857954575a
commit
6d85b0800f
4 changed files with 9 additions and 10 deletions
|
@ -217,7 +217,7 @@ public class ClientTickHandler
|
||||||
Mekanism.flamethrowerActive.add(mc.thePlayer.getCommandSenderName());
|
Mekanism.flamethrowerActive.add(mc.thePlayer.getCommandSenderName());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Mekanism.flamethrowerActive.remove(mc.thePlayer);
|
Mekanism.flamethrowerActive.remove(mc.thePlayer.getCommandSenderName());
|
||||||
}
|
}
|
||||||
|
|
||||||
Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(isFlamethrowerOn(mc.thePlayer)));
|
Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(isFlamethrowerOn(mc.thePlayer)));
|
||||||
|
@ -281,7 +281,7 @@ public class ClientTickHandler
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(EntityPlayer player : (List<EntityPlayer>) mc.theWorld.playerEntities)
|
for(EntityPlayer player : (List<EntityPlayer>)mc.theWorld.playerEntities)
|
||||||
{
|
{
|
||||||
if(hasFlamethrower(player))
|
if(hasFlamethrower(player))
|
||||||
{
|
{
|
||||||
|
|
|
@ -176,7 +176,6 @@ public class RenderTickHandler
|
||||||
if(((ItemFlamethrower)p.getCurrentEquippedItem().getItem()).getGas(p.getCurrentEquippedItem()) != null)
|
if(((ItemFlamethrower)p.getCurrentEquippedItem().getItem()).getGas(p.getCurrentEquippedItem()) != null)
|
||||||
{
|
{
|
||||||
Pos3D playerPos = new Pos3D(p);
|
Pos3D playerPos = new Pos3D(p);
|
||||||
|
|
||||||
Pos3D flameVec = new Pos3D();
|
Pos3D flameVec = new Pos3D();
|
||||||
|
|
||||||
if(p.isSneaking())
|
if(p.isSneaking())
|
||||||
|
|
|
@ -38,17 +38,17 @@ public class CommonPlayerTracker
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onPlayerLogoutEvent(PlayerLoggedOutEvent event)
|
public void onPlayerLogoutEvent(PlayerLoggedOutEvent event)
|
||||||
{
|
{
|
||||||
Mekanism.jetpackOn.remove(event.player);
|
Mekanism.jetpackOn.remove(event.player.getCommandSenderName());
|
||||||
Mekanism.gasmaskOn.remove(event.player);
|
Mekanism.gasmaskOn.remove(event.player.getCommandSenderName());
|
||||||
Mekanism.flamethrowerActive.remove(event.player);
|
Mekanism.flamethrowerActive.remove(event.player.getCommandSenderName());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onPlayerDimChangedEvent(PlayerChangedDimensionEvent event)
|
public void onPlayerDimChangedEvent(PlayerChangedDimensionEvent event)
|
||||||
{
|
{
|
||||||
Mekanism.jetpackOn.remove(event.player);
|
Mekanism.jetpackOn.remove(event.player.getCommandSenderName());
|
||||||
Mekanism.gasmaskOn.remove(event.player);
|
Mekanism.gasmaskOn.remove(event.player.getCommandSenderName());
|
||||||
Mekanism.flamethrowerActive.remove(event.player);
|
Mekanism.flamethrowerActive.remove(event.player.getCommandSenderName());
|
||||||
|
|
||||||
if(!event.player.worldObj.isRemote)
|
if(!event.player.worldObj.isRemote)
|
||||||
{
|
{
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class ContainerMetallurgicInfuser extends Container
|
||||||
}
|
}
|
||||||
else if(ChargeUtils.canBeDischarged(slotStack))
|
else if(ChargeUtils.canBeDischarged(slotStack))
|
||||||
{
|
{
|
||||||
if(!mergeItemStack(slotStack, 4, 5, false))
|
if(!mergeItemStack(slotStack, 0, 1, false))
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue