PaperMC/nms-patches/NetworkManager.patch

38 lines
1.5 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
2016-05-10 13:47:39 +02:00
@@ -114,7 +114,7 @@
2016-02-29 22:32:46 +01:00
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) {
;
}
2017-05-14 04:00:00 +02:00
@@ -236,7 +236,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;
}
2017-05-30 13:25:59 +02:00
@@ -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]));
}
}
}
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);
}