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

Merge branch 'master' into 1.7.10

Browse source 
Conflicts:
	common/mekanism/common/PacketHandler.java
This commit is contained in:
Aidan C. Brady 2014-06-26 23:47:43 -04:00
commit 3b5438a064
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/common/PacketHandler.java
View file

@ -78,8 +78,6 @@ public class PacketHandler
{ {
public SimpleNetworkWrapper netHandler = NetworkRegistry.INSTANCE.newSimpleChannel("MEK"); public SimpleNetworkWrapper netHandler = NetworkRegistry.INSTANCE.newSimpleChannel("MEK");
private int packetsRegistered = 0;
public void initialize() public void initialize()
{ {
netHandler.registerMessage(PacketRobit.class, RobitMessage.class, 0, Side.SERVER); netHandler.registerMessage(PacketRobit.class, RobitMessage.class, 0, Side.SERVER);