diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-05 21:43:47 +0100 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-17 10:32:59 +0100 |
| commit | a48660074969c52ed2547e02981d224b696f93e2 (patch) | |
| tree | fac414d927c9edfae7b91ed7e698f294ff3b700b /nms-patches/NetworkManager.patch | |
| parent | 0a645a2726f031cc2d2c2a801574021283cf50ee (diff) | |
| download | craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.gz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.lz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.xz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.zip | |
Update to 1.8.4
Diffstat (limited to 'nms-patches/NetworkManager.patch')
| -rw-r--r-- | nms-patches/NetworkManager.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/NetworkManager.patch b/nms-patches/NetworkManager.patch index 70ba4ac0..d2ae5ed8 100644 --- a/nms-patches/NetworkManager.patch +++ b/nms-patches/NetworkManager.patch @@ -1,20 +1,20 @@ ---- /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 +--- /home/matt/mc-dev-private//net/minecraft/server/NetworkManager.java 2015-05-05 21:41:21.008633774 +0100 ++++ src/main/java/net/minecraft/server/NetworkManager.java 2015-05-05 21:41:21.012633714 +0100 @@ -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 Channel channel; ++ public Channel channel; // CraftBukkit - public 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. + if (this.channel.isOpen()) { +- this.channel.close().awaitUninterruptibly(); ++ this.channel.close(); // We can't wait as this may be called from an event loop. this.n = ichatbasecomponent; } |