tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Perfected flamethrowers in SMP

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-20 13:13:24 -04:00
parent 5a35d54a5c
commit 2664e2e04c
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/client/ClientTickHandler.java
View file

@ -220,7 +220,7 @@ public class ClientTickHandler
Mekanism.flamethrowerActive.remove(mc.thePlayer.getCommandSenderName()); Mekanism.flamethrowerActive.remove(mc.thePlayer.getCommandSenderName());
} }
Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(isFlamethrowerOn(mc.thePlayer))); Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(mc.thePlayer.getCommandSenderName(), isFlamethrowerOn(mc.thePlayer)));
} }
if(Mekanism.jetpackOn.contains(mc.thePlayer.getCommandSenderName()) != isJetpackOn(mc.thePlayer)) if(Mekanism.jetpackOn.contains(mc.thePlayer.getCommandSenderName()) != isJetpackOn(mc.thePlayer))

12
src/main/java/mekanism/common/network/PacketFlamethrowerActive.java
View file

@ -18,15 +18,15 @@ public class PacketFlamethrowerActive implements IMessageHandler<FlamethrowerAct
if(message.value) if(message.value)
{ {
Mekanism.flamethrowerActive.add(player.getCommandSenderName()); Mekanism.flamethrowerActive.add(message.username);
} }
else { else {
Mekanism.flamethrowerActive.remove(player.getCommandSenderName()); Mekanism.flamethrowerActive.remove(message.username);
} }
if(!player.worldObj.isRemote) if(!player.worldObj.isRemote)
{ {
Mekanism.packetHandler.sendToDimension(new FlamethrowerActiveMessage(message.value), player.worldObj.provider.dimensionId); Mekanism.packetHandler.sendToDimension(new FlamethrowerActiveMessage(message.username, message.value), player.worldObj.provider.dimensionId);
} }
return null; return null;
@ -34,24 +34,28 @@ public class PacketFlamethrowerActive implements IMessageHandler<FlamethrowerAct
public static class FlamethrowerActiveMessage implements IMessage public static class FlamethrowerActiveMessage implements IMessage
{ {
public String username;
public boolean value; public boolean value;
public FlamethrowerActiveMessage() {} public FlamethrowerActiveMessage() {}
public FlamethrowerActiveMessage(boolean state) public FlamethrowerActiveMessage(String name, boolean state)
{ {
username = name;
value = state; value = state;
} }
@Override @Override
public void toBytes(ByteBuf dataStream) public void toBytes(ByteBuf dataStream)
{ {
PacketHandler.writeString(dataStream, username);
dataStream.writeBoolean(value); dataStream.writeBoolean(value);
} }
@Override @Override
public void fromBytes(ByteBuf dataStream) public void fromBytes(ByteBuf dataStream)
{ {
username = PacketHandler.readString(dataStream);
value = dataStream.readBoolean(); value = dataStream.readBoolean();
} }
} }