From 3fa8578175cf2502d996142ce2e8521a87b7d4fc Mon Sep 17 00:00:00 2001 From: Dueris Date: Tue, 11 Aug 2026 15:20:25 -0700 Subject: [PATCH] Use CHM for playersByName --- .../features/0001-Region-Threading-Base.patch | 10 +++++++--- .../features/0002-Max-pending-logins.patch | 2 +- .../features/0007-Region-profiler.patch | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch b/folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch index 46cc7a6ebe..dfd97a7391 100644 --- a/folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch +++ b/folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch @@ -13741,7 +13741,7 @@ index e38acabda1d2e49d88b94d46cc51f6602870d6b6..b1b7bfa011bd4b97896cac51cb36e3f4 parsedDate = defaultValue; } diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index baec5d072b8f2d9379dba850b04e881e5267ca6b..9bbb78ccc6c64930b6c52a3cbc73eb9d81167464 100644 +index baec5d072b8f2d9379dba850b04e881e5267ca6b..e6006a6d3aed938ab5535ba8d11cf874f648d174 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -111,10 +111,10 @@ public abstract class PlayerList { @@ -13757,8 +13757,12 @@ index baec5d072b8f2d9379dba850b04e881e5267ca6b..9bbb78ccc6c64930b6c52a3cbc73eb9d private final UserBanList bans; private final IpBanList ipBans; private final ServerOpList ops; -@@ -135,6 +135,60 @@ public abstract class PlayerList { - private final Map playersByName = new java.util.HashMap<>(); +@@ -132,9 +132,63 @@ public abstract class PlayerList { + + // CraftBukkit start + private org.bukkit.craftbukkit.CraftServer cserver; +- private final Map playersByName = new java.util.HashMap<>(); ++ private final Map playersByName = new java.util.concurrent.ConcurrentHashMap<>(); // Folia - region threading public @Nullable String collideRuleTeamName; // Paper - Configurable player collision + // Folia start - region threading diff --git a/folia-server/minecraft-patches/features/0002-Max-pending-logins.patch b/folia-server/minecraft-patches/features/0002-Max-pending-logins.patch index b5c4100ad7..f187d3193f 100644 --- a/folia-server/minecraft-patches/features/0002-Max-pending-logins.patch +++ b/folia-server/minecraft-patches/features/0002-Max-pending-logins.patch @@ -19,7 +19,7 @@ index 2b641c9180a5890af8fed8bcc8e8ad23d6680c17..95787d6d29ddb8dca78506bb2a115fa6 if (this.state == ServerLoginPacketListenerImpl.State.WAITING_FOR_DUPE_DISCONNECT diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 9bbb78ccc6c64930b6c52a3cbc73eb9d81167464..c36ca30382eb0013644d7230b5585d5123e21cc7 100644 +index e6006a6d3aed938ab5535ba8d11cf874f648d174..d80e23588403f4ec047f98824f017a1b96bd918f 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -149,6 +149,17 @@ public abstract class PlayerList { diff --git a/folia-server/minecraft-patches/features/0007-Region-profiler.patch b/folia-server/minecraft-patches/features/0007-Region-profiler.patch index 2b22526300..1475a0bef4 100644 --- a/folia-server/minecraft-patches/features/0007-Region-profiler.patch +++ b/folia-server/minecraft-patches/features/0007-Region-profiler.patch @@ -1271,7 +1271,7 @@ index 848f4286b1b64f257c8383964b95323d97e4a0de..35ab432bbd59aba80a6eaca1769e6aa8 } diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index c36ca30382eb0013644d7230b5585d5123e21cc7..259eb7574841b1b885093b534440f8a40db4e8e2 100644 +index d80e23588403f4ec047f98824f017a1b96bd918f..982ed9c0452842eb3c58681713e51bfef06e3bc2 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -1033,6 +1033,7 @@ public abstract class PlayerList {