Skip to content

Use CHM for playersByName #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dueris wants to merge 1 commit into
base: ver/26.2.x
Choose a base branch
from
Open

Use CHM for playersByName #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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<String,ServerPlayer> playersByName = new java.util.HashMap<>();
@@ -132,9 +132,63 @@ public abstract class PlayerList {

// CraftBukkit start
private org.bukkit.craftbukkit.CraftServer cserver;
- private final Map<String,ServerPlayer> playersByName = new java.util.HashMap<>();
+ private final Map<String,ServerPlayer> playersByName = new java.util.concurrent.ConcurrentHashMap<>(); // Folia - region threading
public @Nullable String collideRuleTeamName; // Paper - Configurable player collision

+ // Folia start - region threading
Expand Down
2 changes: 1 addition & 1 deletion folia-server/minecraft-patches/features/0002-Max-pending-logins.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion folia-server/minecraft-patches/features/0007-Region-profiler.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down