@@ -41,7 +41,7 @@
         this.g = enumprotocoldirection;
     }
 
-    public void channelActive(ChannelHandlerContext channelhandlercontext) {
+    public void channelActive(ChannelHandlerContext channelhandlercontext) throws Exception { // CraftBukkit - added throws
         super.channelActive(channelhandlercontext);
         this.i = channelhandlercontext.channel();
         this.j = this.i.remoteAddress();
@@ -159,7 +159,7 @@
 
     public void close(IChatBaseComponent ichatbasecomponent) {
         if (this.i.isOpen()) {
-            this.i.close().awaitUninterruptibly();
+            this.i.close(); // We can't wait as this may be called from an event loop.
             this.l = ichatbasecomponent;
         }