diff options
| -rw-r--r-- | patches/server/0949-Fix-player-kick-on-shutdown.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0949-Fix-player-kick-on-shutdown.patch b/patches/server/0949-Fix-player-kick-on-shutdown.patch index 65fe95e7f6..093c09fb8e 100644 --- a/patches/server/0949-Fix-player-kick-on-shutdown.patch +++ b/patches/server/0949-Fix-player-kick-on-shutdown.patch @@ -9,7 +9,7 @@ also check if all packets are ignored during the shutdown process. See net.minecraft.network.Connection#channelRead0(ChannelHandlerContext, Packet) and net.minecraft.util.thread.BlockableEventLoop#executeIfPossible(Runnable) diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java -index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..edefab4e22ee7217e17eb036165ce58788d4c782 100644 +index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..27d4aa45e585842c04491839826d405d6f447f0e 100644 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java @@ -41,7 +41,7 @@ public class PacketUtils { @@ -17,7 +17,7 @@ index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..edefab4e22ee7217e17eb036165ce587 public static <T extends PacketListener> void ensureRunningOnSameThread(Packet<T> packet, T listener, BlockableEventLoop<?> engine) throws RunningOnDifferentThreadException { if (!engine.isSameThread()) { - engine.executeIfPossible(() -> { -+ engine.execute(() -> { // Paper - Fix preemptive player kick on a server shutdown. ++ engine.execute(() -> { // Paper - Fix preemptive player kick on a server shutdown. packetProcessing.push(listener); // Paper - detailed watchdog information try { // Paper - detailed watchdog information if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerGamePacketListenerImpl && ((ServerGamePacketListenerImpl) listener).processedDisconnect)) return; // CraftBukkit, MC-142590 |