From 16e8d3aea410c6bbe07459bf08c865168a99d03c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 9 Jan 2024 14:37:27 -0800 Subject: [PATCH] Check processed disconnect after invoking keepConnectionAlive() Since we move this up, we need to check it to prevent ticking a possibly removed player --- patches/server/0003-Threaded-Regions.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0003-Threaded-Regions.patch b/patches/server/0003-Threaded-Regions.patch index ce3a761..77e3686 100644 --- a/patches/server/0003-Threaded-Regions.patch +++ b/patches/server/0003-Threaded-Regions.patch @@ -15145,7 +15145,7 @@ index 79326308f6126f84a3cbb3d5a33302de048d8a50..81090d1b5d67506268a41c6387a1d453 Collections.shuffle( this.connections ); } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 64255f7db85886421d5029766e8a6d1eadb94cff..de25bf4893ac741fe687ab9bb0aa975db8686400 100644 +index 64255f7db85886421d5029766e8a6d1eadb94cff..d5d2dae8589749f79520d05feb0627d3c425628b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -292,7 +292,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -15186,7 +15186,7 @@ index 64255f7db85886421d5029766e8a6d1eadb94cff..de25bf4893ac741fe687ab9bb0aa975d public void tick() { + // Folia start - region threading + this.keepConnectionAlive(); -+ if (this.player.wonGame) { ++ if (this.processedDisconnect || this.player.wonGame) { + return; + } + // Folia end - region threading