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

35 lines
1.5 KiB
Diff
Raw Normal View History

From 0900458c1c5a86d279f4812528d2245a9f5e5437 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
2020-06-25 10:00:00 +10:00
index 614de58df..69718caa3 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
2020-06-25 10:00:00 +10:00
@@ -318,6 +318,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
2016-03-01 08:33:06 +11:00
} else if (this.i() != null) {
2020-06-25 10:00:00 +10:00
this.i().a(new ChatMessage("multiplayer.disconnect.generic"));
2015-07-22 19:04:46 +10:00
}
2018-12-13 11:00:00 +11:00
+ this.packetQueue.clear(); // Free up packet queue.
2015-07-22 19:04:46 +10:00
}
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
index 3292cd30a..3e3deefde 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1445,7 +1445,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
// 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
--
2.25.1
2015-07-22 19:04:46 +10:00