Paper/CraftBukkit-Patches/0146-Clear-Packet-Queue-on-Disconnect.patch

35 lines
1.5 KiB
Diff
Raw Normal View History

2016-03-14 06:57:03 +01:00
From 328d5299f11ac60682ca5cadfac7db5934f94ac1 Mon Sep 17 00:00:00 2001
2015-07-22 11:04:46 +02: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
2016-02-29 22:33:06 +01:00
index 4c6dfb1..a9ea3f5 100644
2015-07-22 11:04:46 +02:00
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
2016-02-29 22:33:06 +01:00
@@ -316,6 +316,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
} else if (this.i() != null) {
this.i().a(new ChatComponentText("Disconnected"));
2015-07-22 11:04:46 +02:00
}
+ this.i.clear(); // Free up packet queue.
}
2016-02-29 22:33:06 +01:00
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2016-03-14 06:57:03 +01:00
index f354985..39ba550 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2016-03-14 06:57:03 +01:00
@@ -1084,7 +1084,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 11:04:46 +02:00
--
2016-02-29 22:33:06 +01:00
2.5.0
2015-07-22 11:04:46 +02:00