--- /home/matt/mc-dev-private//net/minecraft/server/NetworkManager.java 2015-03-19 21:26:27.850141796 +0000 +++ src/main/java/net/minecraft/server/NetworkManager.java 2015-03-19 21:26:27.850141796 +0000 @@ -63,7 +63,7 @@ private final EnumProtocolDirection h; private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue(); private final ReentrantReadWriteLock j = new ReentrantReadWriteLock(); - private Channel k; + public Channel k; // CraftBukkit - public, PAIL: Rename channel private SocketAddress l; private PacketListener m; private IChatBaseComponent n; @@ -231,7 +231,7 @@ public void close(IChatBaseComponent ichatbasecomponent) { if (this.k.isOpen()) { - this.k.close().awaitUninterruptibly(); + this.k.close(); // We can't wait as this may be called from an event loop. this.n = ichatbasecomponent; } @@ -308,7 +308,7 @@ } } - protected void channelRead0(ChannelHandlerContext channelhandlercontext, Object object) throws Exception { + protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet object) throws Exception { // CraftBukkit - fix decompile error this.a(channelhandlercontext, (Packet) object); }