mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-25 02:17:35 +01:00
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
From 328d5299f11ac60682ca5cadfac7db5934f94ac1 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 4c6dfb1..a9ea3f5 100644
|
|
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
|
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
|
@@ -316,6 +316,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
|
} else if (this.i() != null) {
|
|
this.i().a(new ChatComponentText("Disconnected"));
|
|
}
|
|
+ this.i.clear(); // Free up packet queue.
|
|
}
|
|
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index f354985..39ba550 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -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;
|
|
--
|
|
2.5.0
|
|
|