mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Clear Packet Queue on Disconnect

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2015-07-22 19:04:37 +10:00
commit 93fea68749
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
paper-server/patches/sources/net/minecraft/network/Connection.java.patch
View file

@ -73,3 +73,11 @@
public void write(ChannelHandlerContext channelhandlercontext, Object object, ChannelPromise channelpromise) throws Exception { public void write(ChannelHandlerContext channelhandlercontext, Object object, ChannelPromise channelpromise) throws Exception {
super.write(channelhandlercontext, object, channelpromise); super.write(channelhandlercontext, object, channelpromise);
} }
@@ -661,6 +674,7 @@
packetlistener1.onDisconnect(disconnectiondetails);
}
+ this.pendingActions.clear(); // Free up packet queue.
}
}

2
paper-server/patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch
View file

@ -197,7 +197,7 @@
public void send(Packet<?> packet, @Nullable PacketSendListener callbacks) { public void send(Packet<?> packet, @Nullable PacketSendListener callbacks) {
+ // CraftBukkit start + // CraftBukkit start
+ if (packet == null) { + if (packet == null || this.processedDisconnect) { // Spigot
+ return; + return;
+ } else if (packet instanceof ClientboundSetDefaultSpawnPositionPacket) { + } else if (packet instanceof ClientboundSetDefaultSpawnPositionPacket) {
+ ClientboundSetDefaultSpawnPositionPacket packet6 = (ClientboundSetDefaultSpawnPositionPacket) packet; + ClientboundSetDefaultSpawnPositionPacket packet6 = (ClientboundSetDefaultSpawnPositionPacket) packet;