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

@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
@@ -50,7 +51,7 @@ public class PacketClientState implements IMessage, IMessageHandler<PacketClient
if(selectedChannel.isPublic()) {
ByteBufUtils.writeUTF8String(buf, "");
} else {
ByteBufUtils.writeUTF8String(buf, selectedChannel.user);
ByteBufUtils.writeUTF8String(buf, selectedChannel.user.toString());
}
}
@@ -70,7 +71,7 @@ public class PacketClientState implements IMessage, IMessageHandler<PacketClient
selectedChannel = null;
if(name != null && name.trim().length() > 0) {
if(user != null && user.trim().length() > 0) {
selectedChannel = new Channel(name, user);
selectedChannel = new Channel(name, UUID.fromString(user));
} else {
selectedChannel = new Channel(name, null);
}