diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-26 08:32:16 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2014-11-28 17:16:30 +1100 |
commit | 24557bc2b37deb6a0edf497d547471832457b1dd (patch) | |
tree | c560572889a3b0b34964a0cddb35dc87fda3c914 /nms-patches/NetworkManager.patch | |
parent | a4805dbd77da057cc1ea0bf344379bc6e53ca1f6 (diff) | |
download | craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar.gz craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar.lz craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar.xz craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.zip |
Update to Minecraft 1.8
For more information please see http://www.spigotmc.org/
Diffstat (limited to 'nms-patches/NetworkManager.patch')
-rw-r--r-- | nms-patches/NetworkManager.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/nms-patches/NetworkManager.patch b/nms-patches/NetworkManager.patch new file mode 100644 index 00000000..99a6dc91 --- /dev/null +++ b/nms-patches/NetworkManager.patch @@ -0,0 +1,20 @@ +--- ../work/decompile-bb26c12b/net/minecraft/server/NetworkManager.java 2014-11-27 08:59:46.809421371 +1100 ++++ src/main/java/net/minecraft/server/NetworkManager.java 2014-11-27 08:42:10.120850973 +1100 +@@ -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; + } + |