spigot/CraftBukkit-Patches/0137-Clear-Packet-Queue-on-Disconnect.patch

35 lines
1.5 KiB
Diff
Raw Normal View History

2017-05-19 21:00:22 +10:00
From 8e60dbfab6c7b65b75dcdb8b6bc7417eba9b9661 Mon Sep 17 00:00:00 2001
2015-07-22 19:04:46 +10:00
From: md_5 <git@md-5.net>
Date: Wed, 22 Jul 2015 19:04:37 +1000
Subject: [PATCH] Clear Packet Queue on Disconnect
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
2017-05-14 12:00:00 +10:00
index 965c88e4..58011bb2 100644
2015-07-22 19:04:46 +10:00
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
2017-05-14 12:00:00 +10:00
@@ -320,6 +320,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
2016-03-01 08:33:06 +11:00
} else if (this.i() != null) {
this.i().a(new ChatComponentText("Disconnected"));
2015-07-22 19:04:46 +10:00
}
+ this.i.clear(); // Free up packet queue.
}
2016-03-01 08:33:06 +11:00
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2017-05-19 21:00:22 +10:00
index 4540f566..3bcabb19 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2017-05-19 21:00:22 +10:00
@@ -1112,7 +1112,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
// CraftBukkit start
- if (packet == null) {
+ if (packet == null || this.processedDisconnect) { // Spigot
return;
} else if (packet instanceof PacketPlayOutSpawnPosition) {
PacketPlayOutSpawnPosition packet6 = (PacketPlayOutSpawnPosition) packet;
2015-07-22 19:04:46 +10:00
--
2017-04-22 15:54:44 +10:00
2.11.0
2015-07-22 19:04:46 +10:00