Revert "Merge remote-tracking branch 'origin/master' into 1.7.10"

Yeah that didn't work...

This reverts commit 714542e2c2, reversing
changes made to b579bcdcd8.
This commit is contained in:
tterrag1098 committed 2014-06-28 23:53:49 -04:00
1 parent 714542e2c2
commit 7c7b644b3f
53 files changed
+150 -1078

No files matched your search

@@ -1,5 +1,7 @@
package crazypants.enderio.machine.hypercube;
import java.util.UUID;
import io.netty.buffer.ByteBuf;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.ByteBufUtils;
@@ -28,7 +30,7 @@ public class PacketAddRemoveChannel implements IMessage, IMessageHandler<PacketA
buf.writeBoolean(channel.isPublic());
ByteBufUtils.writeUTF8String(buf, channel.name);
if(!channel.isPublic()) {
ByteBufUtils.writeUTF8String(buf, channel.user);
ByteBufUtils.writeUTF8String(buf, channel.user.toString());
}
}
@@ -42,7 +44,7 @@ public class PacketAddRemoveChannel implements IMessage, IMessageHandler<PacketA
if(!isPublic) {
user = ByteBufUtils.readUTF8String(data);
}
channel = new Channel(name, user);
channel = new Channel(name, user == null ? null : UUID.fromString(user));
}
@Override