diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index eed696491..055d1a17d 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -436,6 +436,11 @@ public class ClientTickHandler public static boolean isFlamethrowerOn(EntityPlayer player) { + if(player != mc.thePlayer) + { + return Mekanism.flamethrowerActive.contains(player.getCommandSenderName()); + } + if(hasFlamethrower(player)) { if(mc.gameSettings.keyBindUseItem.getIsKeyPressed()) diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 7347e4cd3..9e9835c5f 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -1,9 +1,7 @@ package mekanism.client.render; -import java.util.HashSet; import java.util.List; import java.util.Random; -import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -15,7 +13,6 @@ import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; @@ -195,7 +192,15 @@ public class RenderTickHandler } else { flameVec.xPos -= 0.45F; - flameVec.yPos -= 0.5F; + + if(player == p) + { + flameVec.yPos -= 0.5F; + } + else { + flameVec.yPos += 1F; + } + flameVec.zPos += 1.05F; flameVec.rotateYaw(p.renderYawOffset); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 2baba0e76..87868d355 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -125,6 +125,7 @@ public class PacketHandler netHandler.registerMessage(PacketBoxBlacklist.class, BoxBlacklistMessage.class, 24, Side.CLIENT); netHandler.registerMessage(PacketPortableTankState.class, PortableTankStateMessage.class, 25, Side.SERVER); netHandler.registerMessage(PacketContainerEditMode.class, ContainerEditModeMessage.class, 26, Side.SERVER); + netHandler.registerMessage(PacketFlamethrowerActive.class, FlamethrowerActiveMessage.class, 27, Side.CLIENT); netHandler.registerMessage(PacketFlamethrowerActive.class, FlamethrowerActiveMessage.class, 27, Side.SERVER); netHandler.registerMessage(PacketDropperUse.class, DropperUseMessage.class, 28, Side.SERVER); } diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java b/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java index 9f3b1b43e..9e6816e08 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java @@ -1,16 +1,14 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketFlamethrowerActive.FlamethrowerActiveMessage; - import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketFlamethrowerActive implements IMessageHandler { @Override @@ -26,6 +24,11 @@ public class PacketFlamethrowerActive implements IMessageHandler