1 files changed, 25 insertions, 16 deletions
diff --git a/nms-patches/NetworkManager.patch b/nms-patches/NetworkManager.patch
index dc5b506b..1379f171 100644
--- a/nms-patches/NetworkManager.patch
+++ b/nms-patches/NetworkManager.patch
@@ -1,20 +1,29 @@
---- ../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 @@
+--- /home/matt/mc-dev-private//net/minecraft/server/NetworkManager.java	2015-02-26 22:40:22.895608136 +0000
++++ src/main/java/net/minecraft/server/NetworkManager.java	2015-02-26 22:40:22.895608136 +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
+     private SocketAddress l;
+     private PacketListener m;
+     private IChatBaseComponent n;
+@@ -231,7 +231,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;
+         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);
+     }