PaperMC/nms-patches/NetworkManager.patch

30 lines
1.2 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/NetworkManager.java
+++ b/net/minecraft/server/NetworkManager.java
2015-02-26 23:41:06 +01:00
@@ -63,7 +63,7 @@
private final EnumProtocolDirection h;
private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
2015-05-05 22:43:47 +02:00
- private Channel channel;
+ public Channel channel; // CraftBukkit - public
2015-02-26 23:41:06 +01:00
private SocketAddress l;
private PacketListener m;
private IChatBaseComponent n;
@@ -231,7 +231,7 @@
public void close(IChatBaseComponent ichatbasecomponent) {
2015-05-05 22:43:47 +02:00
if (this.channel.isOpen()) {
- this.channel.close().awaitUninterruptibly();
+ this.channel.close(); // We can't wait as this may be called from an event loop.
2015-02-26 23:41:06 +01:00
this.n = ichatbasecomponent;
}
@@ -308,7 +308,7 @@
}
2015-02-26 23:41:06 +01:00
}
- 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);
}