Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.lang.reflect.Method;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
Expand All @@ -27,7 +28,11 @@ public final class BedrockNameResolver {
private final String bedrockPrefix;
private final AdvancedCorePlugin plugin;

private static final String CANONICAL_NAME_KEY = "BedrockCanonicalName";
private final Map<String, Boolean> cache = new ConcurrentHashMap<>();
// An observed server name is separate from Bedrock client/transport detection.
private final Map<String, String> canonicalNames = new ConcurrentHashMap<>();
private final Set<String> observedBedrockNames = ConcurrentHashMap.newKeySet();
private final Map<String, String> ciIndex = new ConcurrentHashMap<>();

/**
Expand Down Expand Up @@ -127,30 +132,90 @@ public void learn(AdvancedCoreUser user) {
String name = user.getPlayerName();
if (name == null || name.isEmpty())
return;
putLearned(name, user.isBedrockUser());
boolean bedrock = user.isBedrockUser();
putLearned(name, bedrock);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
String canonical = bedrock ? storedCanonicalName(user, name) : null;
if (canonical != null) canonicalNames.put(name.toLowerCase(Locale.ROOT), canonical);
}

/**
* Learns whether a player is a Bedrock player.
*
* Observations are immediately available in this resolver. Persistence is queued
* on the ordered user-storage worker and follows ordinary user-cache durability;
* return does not acknowledge a durable write. Call from the platform owner.
* Legacy inline notifications return through that player's owner scheduler;
* the shared-SQL notification lane remains worker-owned.
*
* @param player the player to learn from
*/
public void learn(Player player) {
if (player == null)
return;
if (player == null) return;
// Capture storage identity now. The Player is only a platform callback target.
final UUID uuid = player.getUniqueId();
final boolean isBedrock = bedrockDetect.isBedrock(uuid);
final String originalName = player.getName();
if (isBedrock) {
plugin.debug("Learned Bedrock player: " + originalName + " (" + uuid + ")");
cache.put(originalName, true);
ciIndex.put(originalName.toLowerCase(Locale.ROOT), originalName);
AdvancedCoreUser user = userManager.getUser(player);
if (user != null)
user.setBedrockUser(true);
final String name = player.getName();
if (uuid == null || name == null || name.isEmpty() || !bedrockDetect.isBedrock(uuid)) return;
canonicalNames.put(name.toLowerCase(Locale.ROOT), name);
observedBedrockNames.add(name.toLowerCase(Locale.ROOT));
putLearned(name, true);
var manager = userManager.getDataManager();
if (manager == null || manager.getTimer() == null) {
reportLearningFailure();
return;
}
try {
manager.getTimer().execute(() -> {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
try {
Runnable mutation = () -> {
AdvancedCoreUser user = userManager.getUser(uuid, name);
if (user == null) { reportLearningFailure(); return; }
// Evidence on this UUID record, never a name/UUID remap.
user.getData().setString(CANONICAL_NAME_KEY, name);
user.setBedrockUser(true);
};
// Shared SQL queues its notifications for later, outside this inline scope.
userManager.withUserDataChangeDispatcher(notification -> {
try {
plugin.getBukkitScheduler().runTask(plugin, notification, player);
} catch (RuntimeException rejected) {
plugin.getLogger().warning("Unable to deliver observed Bedrock identity notification");
}
}, mutation);
} catch (RuntimeException failure) {
reportLearningFailure();
}
});
} catch (RuntimeException rejected) {
reportLearningFailure();
}
}

private void reportLearningFailure() {
plugin.getLogger().warning("Unable to persist observed Bedrock identity; observation remains session-local");
}

private String storedCanonicalName(AdvancedCoreUser user, String name) {
try {
if (user.getData() == null) return null;
String observed = user.getData().getString(CANONICAL_NAME_KEY, user.getUserDataFetchMode());
// Never let metadata redirect a query to another name/account.
return observed != null && observed.equalsIgnoreCase(name) ? observed : null;
} catch (RuntimeException unreadable) {
plugin.getLogger().warning("Unable to read observed Bedrock identity; retaining legacy resolution");
return null;
}
}

private String exactName(String name, boolean bedrock) {
String observed = canonicalNames.get(name.toLowerCase(Locale.ROOT));
return observed == null ? addPrefixIfNeeded(name, bedrock) : observed;
}

private String storedExactName(String name, boolean bedrock, AdvancedCoreUser user) {
String observed = bedrock ? storedCanonicalName(user, name) : null;
return observed == null ? addPrefixIfNeeded(name, bedrock) : observed;
}

/**
* Detect whether a name corresponds to a Bedrock player.
*
Expand Down Expand Up @@ -192,15 +257,15 @@ public Result resolve(String incomingName) {
Boolean cached = getCachedCaseInsensitive(incomingName);
if (cached != null) {
boolean bedrock = cached;
String finalName = addPrefixIfNeeded(incomingName, bedrock);
String finalName = exactName(incomingName, bedrock);
return new Result(finalName, bedrock, "cache-" + (bedrock ? "bedrock" : "java"));
}

try {
if (userManager.userExistStored(incomingName)) {
AdvancedCoreUser user = userManager.getUser(incomingName);
boolean bedrock = user.isBedrockUser();
String finalName = addPrefixIfNeeded(incomingName, bedrock);
String finalName = storedExactName(incomingName, bedrock, user);
return new Result(finalName, bedrock, "db-" + (bedrock ? "bedrock" : "java"));
}
} catch (Throwable ignored) {
Expand Down Expand Up @@ -321,7 +386,7 @@ private Result resolvePersisted(String incomingName, Result fallback) {
AdvancedCoreUser user = getPersistedUser(incomingName);
if (user != null) {
boolean bedrock = user.isBedrockUser();
return new Result(addPrefixIfNeeded(incomingName, bedrock), bedrock,
return new Result(storedExactName(incomingName, bedrock, user), bedrock,
"db-" + (bedrock ? "bedrock" : "java"));
}

Expand Down Expand Up @@ -387,26 +452,28 @@ private Result resolveExactWithoutDb(String incomingName) {
if (match != null) return resultFromOnlineMatch(incomingName, match);
Boolean cached = getCachedCaseInsensitive(incomingName);
if (cached == null) return null;
return new Result(addPrefixIfNeeded(incomingName, cached), cached,
return new Result(exactName(incomingName, cached), cached,
"cache-" + (cached ? "bedrock" : "java"));
}

/**
* Get the prefixed name if the player is a Bedrock player.
* Get the canonical name, preserving observed linked Java and unlinked Bedrock identities.
*
* @param name the player name
* @return the prefixed name if Bedrock, otherwise the original name
* @return the canonical name selected by the resolver
*/
public String getPrefixedIfBedrock(String name) {
return addPrefixIfNeeded(name, isBedrockName(name));
return resolve(name).finalName;
}

/**
* Clear the cache and case-insensitive index.
*/
public void clearCache() {
observedBedrockNames.clear();
cache.clear();
ciIndex.clear();
canonicalNames.clear();
}

private void putLearned(String originalCaseName, boolean isBedrock) {
Expand All @@ -417,6 +484,9 @@ private void putLearned(String originalCaseName, boolean isBedrock) {
}

private Boolean getCachedCaseInsensitive(String name) {
// Player observations outrank a pending stored flag. Persisted canonical
// metadata alone is not a new client observation and cannot force true.
if (observedBedrockNames.contains(name.toLowerCase(Locale.ROOT))) return true;
Boolean exact = cache.get(name);
if (exact != null)
return exact;
Expand Down Expand Up @@ -462,7 +532,8 @@ private String stripPrefixIfPresent(String n) {

private Result resultFromOnlineMatch(String incomingName, Player match) {
boolean bedrock = bedrockDetect.isBedrock(match.getUniqueId());
String finalName = bedrock ? addPrefixIfNeeded(match.getName(), true) : incomingName;
// Bukkit already exposes the canonical linked Java or unlinked Bedrock name.
String finalName = bedrock ? match.getName() : incomingName;
return new Result(finalName, bedrock, bedrock ? "online-uuid-bedrock" : "online-uuid-java");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ public class UserManager {
private final AdvancedCorePlugin plugin;

@Getter
private final ArrayList<UserDataChanged> userDataChange = new ArrayList<>();
private final ArrayList<UserDataChanged> userDataChange = new ArrayList<>();
private final ThreadLocal<Consumer<Runnable>> userDataChangeDispatcher = new ThreadLocal<>();

@Getter
private UserValidationService validationService;
Expand Down Expand Up @@ -581,12 +582,37 @@ public void load() {
validationService = UserValidationFactory.create(plugin);
}

public void onChange(AdvancedCoreUser user, String... keys) {
for (UserDataChanged change : userDataChange) {
change.onChange(user, keys);
}
}

/**
* Scope inline user-data notifications to an integration-owned dispatcher while
* the mutation itself stays on its caller. Other threads and deferred shared-SQL
* notifications retain their existing lanes. Nested scopes restore their owner.
*/
public void withUserDataChangeDispatcher(Consumer<Runnable> dispatcher, Runnable mutation) {
java.util.Objects.requireNonNull(dispatcher, "dispatcher");
java.util.Objects.requireNonNull(mutation, "mutation");
Consumer<Runnable> previous = userDataChangeDispatcher.get();
userDataChangeDispatcher.set(dispatcher);
try { mutation.run(); }
finally {
if (previous == null) userDataChangeDispatcher.remove();
else userDataChangeDispatcher.set(previous);
}
}

public void onChange(AdvancedCoreUser user, String... keys) {
Consumer<Runnable> dispatcher = userDataChangeDispatcher.get();
if (dispatcher == null) {
notifyUserDataChange(user, keys);
} else {
String[] snapshot = keys == null ? null : keys.clone();
dispatcher.accept(() -> notifyUserDataChange(user, snapshot));
}
}

private void notifyUserDataChange(AdvancedCoreUser user, String... keys) {
for (UserDataChanged change : userDataChange) change.onChange(user, keys);
}

public void purgeOldPlayersNow() {
if (plugin.getOptions().isPurgeOldData()) {
HashMap<UUID, ArrayList<Column>> cols = getAllKeys();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,7 @@ private void loadKeys() {
addKey(new UserDataKeyString("ChoicePreference"));
addKey(new UserDataKeyBoolean("CheckWorld"));
addKey(new UserDataKeyBoolean("isBedrock"));
addKey(new UserDataKeyString("BedrockCanonicalName"));
}

public void removeCache(UUID uuid, String playerName) {
Expand Down
Loading
Loading