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

35 lines
1.7 KiB
Diff
Raw Normal View History

2022-06-12 18:29:19 +10:00
From dd5f74ba9831688ca4b476f18ed3678ae63f79cb 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
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
2022-06-08 02:00:00 +10:00
index 3ddc3480c..3e702cfc5 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/network/NetworkManager.java
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
2022-03-01 02:00:00 +11:00
@@ -415,6 +415,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
2021-11-22 09:00:00 +11:00
} else if (this.getPacketListener() != null) {
2022-06-08 02:00:00 +10:00
this.getPacketListener().onDisconnect(IChatBaseComponent.translatable("multiplayer.disconnect.generic"));
2015-07-22 19:04:46 +10:00
}
2021-06-11 15:00:00 +10:00
+ this.queue.clear(); // Free up packet queue.
2015-07-22 19:04:46 +10:00
}
2016-03-01 08:33:06 +11:00
}
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 18dbcfc82..d5aa6e690 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
2022-06-08 02:00:00 +10:00
@@ -1750,7 +1750,7 @@ public class PlayerConnection implements ServerPlayerConnection, PacketListenerP
2021-11-22 09:00:00 +11:00
public void send(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
// 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.34.1
2015-07-22 19:04:46 +10:00