PaperMC/nms-patches/NetworkManager.patch
2017-05-30 21:55:13 +10:00

37 lines
1.5 KiB
Diff

--- a/net/minecraft/server/NetworkManager.java
+++ b/net/minecraft/server/NetworkManager.java
@@ -114,7 +114,7 @@
protected void a(ChannelHandlerContext channelhandlercontext, Packet<?> packet) throws Exception {
if (this.channel.isOpen()) {
try {
- packet.a(this.m);
+ ((Packet) packet).a(this.m); // CraftBukkit - decompile error
} catch (CancelledPacketHandleException cancelledpackethandleexception) {
;
}
@@ -236,7 +236,7 @@
public void close(IChatBaseComponent ichatbasecomponent) {
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;
}
@@ -306,14 +306,14 @@
if (this.j() != null) {
this.i().a(this.j());
} else if (this.i() != null) {
- this.i().a(new ChatMessage("multiplayer.disconnect.banned", new Object[0]));
+ this.i().a(new ChatMessage("multiplayer.disconnect.generic", new Object[0]));
}
}
}
}
- 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);
}