wzp/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2025-04-23 04:39:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash if player disconnects during login stage

Browse Source
This commit is contained in:
Spottedleaf 2023-03-09 21:17:18 -08:00
parent a9d01f9b4f
commit 8625606b3d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/0004-Threaded-Regions.patch
View File

@ -16270,7 +16270,7 @@ index a25306fe8a35bb70a490e6a0c01d0340bbc0d781..626d99c785d2886bce605ba468ee24ce
private State() {} private State() {}
} }
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 3c9d08c37a44a60bc70387d8d0dbd0a39ea98a26..a0267f2e110bacd30f33978414fd2aff2dc84ab1 100644 index 3c9d08c37a44a60bc70387d8d0dbd0a39ea98a26..f60feb0b9101afa24363c438949e1d60ccab0272 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -138,7 +138,7 @@ public abstract class PlayerList { @@ -138,7 +138,7 @@ public abstract class PlayerList {
@ -16406,6 +16406,15 @@ index 3c9d08c37a44a60bc70387d8d0dbd0a39ea98a26..a0267f2e110bacd30f33978414fd2aff
this.server.invalidateStatus(); this.server.invalidateStatus();
MutableComponent ichatmutablecomponent; MutableComponent ichatmutablecomponent;
@@ -319,7 +387,7 @@ public abstract class PlayerList {
this.cserver.getPluginManager().callEvent(playerJoinEvent);
if (!player.connection.connection.isConnected()) {
- return;
+ //return; // Folia - region threading - must still allow the player to connect, as we must add to chunk map before handling disconnect
}
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
@@ -334,8 +402,7 @@ public abstract class PlayerList { @@ -334,8 +402,7 @@ public abstract class PlayerList {
ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player));

2
patches/server/0008-Max-pending-logins.patch
View File

@ -19,7 +19,7 @@ index 626d99c785d2886bce605ba468ee24ce1710beb2..37ca4f314c8f0fdca2927c0b425bda4b
} // Folia - region threading - remove delayed accept } // Folia - region threading - remove delayed accept
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index a0267f2e110bacd30f33978414fd2aff2dc84ab1..d75932753449df47fcd9c6409cf43e7e5327e9de 100644 index f60feb0b9101afa24363c438949e1d60ccab0272..fe4d87e08e8910524e6e3413377e3ba9d039bf03 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -168,6 +168,8 @@ public abstract class PlayerList { @@ -168,6 +168,8 @@ public abstract class PlayerList {