Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 17:18:37 +01:00
Code Issues Projects Releases Wiki Activity

Don't cache previously known offline names

Browse Source 
This can lead to the potential that a UUID can
be mapped to the improper name. This logic should
be handled the join logic.
This commit is contained in:
Josh Roy 2023-08-01 13:45:08 -04:00 committed by MD
parent 02ced188c8
commit 19d6db0b4c
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java
View File

@ -166,8 +166,23 @@ public class ModernUserMap extends CacheLoader<UUID, User> implements IUserMap {
if (userFile.exists()) { if (userFile.exists()) {
player = new OfflinePlayerStub(uuid, ess.getServer()); player = new OfflinePlayerStub(uuid, ess.getServer());
user = new User(player, ess); user = new User(player, ess);
((OfflinePlayerStub) player).setName(user.getLastAccountName()); final String accName = user.getLastAccountName();
uuidCache.updateCache(uuid, user.getLastAccountName()); ((OfflinePlayerStub) player).setName(accName);
// Check to see if there is already a UUID mapping for the name in the name cache before updating it.
// Since this code is ran for offline players, there's a chance we could be overriding the mapping
// for a player who changed their name to an older player's name, let that be handled during join.
//
// Here is a senerio which could take place if didn't do the containsKey check;
// "JRoyLULW" joins the server - "JRoyLULW" is mapped to 86f39a70-eda7-44a2-88f8-0ade4e1ec8c0
// "JRoyLULW" changes their name to "mbax" - Nothing happens, they are yet to join the server
// "mdcfe" changes their name to "JRoyLULW" - Nothing happens, they are yet to join the server
// "JRoyLULW" (formally "mdcfe") joins the server - "JRoyLULW" is mapped to 62a6a4bb-a2b8-4796-bfe6-63067250990a
// The /baltop command is ran, iterating over all players.
//
// During the baltop iteration, two uuids have the `last-account-name` of "JRoyLULW" creating the
// potential that "JRoyLULW" is mapped back to 86f39a70-eda7-44a2-88f8-0ade4e1ec8c0 when the true
// bearer of that name is now 62a6a4bb-a2b8-4796-bfe6-63067250990a.
uuidCache.updateCache(uuid, (accName == null || uuidCache.getNameCache().containsKey(accName)) ? null : accName);
return user; return user;
} }