nms-patches/NetworkManager.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

--- ../work/decompile-8eb82bde//net/minecraft/server/NetworkManager.java	2014-11-28 17:43:43.265707431 +0000
+++ src/main/java/net/minecraft/server/NetworkManager.java	2014-11-28 17:38:19.000000000 +0000
@@ -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;
         }