Skip to content

Fix updating join message when not needed#6312

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

Merged
JRoy merged 2 commits into from
Oct 3, 2025
Merged

Fix updating join message when not needed #6312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaa53ab
Fix updating join message when not needed
JRoy Oct 3, 2025
d6d357f
Merge branch '2.x' into bug/6307
JRoy Oct 3, 2025
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
5 changes: 4 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,7 +450,10 @@ private void joinFlow(final User user, final long currentTime, final String mess
effectiveMessage = message;
}

joinMessageConsumer.accept(effectiveMessage);
// Only change the vanilla join message if it's different to avoid nuking client translation
if (effectiveMessage != null && !effectiveMessage.equals(message) || message != null && effectiveMessage == null) {
joinMessageConsumer.accept(effectiveMessage);
}

ess.runTaskAsynchronously(() -> ess.getServer().getPluginManager().callEvent(new AsyncUserDataLoadEvent(user, effectiveMessage)));

Expand Down
Loading