fix: reset nickname when player changes Minecraft account name (#6470)

Closes #6469

---------

Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>

Author: hudsonandres

Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -420,14 +420,19 @@ private void joinFlow(final User user, final long currentTime, final String mess
 
         final String lastAccountName = user.getLastAccountName(); // For comparison
         user.setLastAccountName(user.getBase().getName());
+
+        final boolean newUsername = lastAccountName != null && !lastAccountName.equals(user.getBase().getName());
+
+        // If the Minecraft account name changed, reset the nickname so the old one doesn't persist
+        if (ess.getSettings().isResetNickOnNameChange() && newUsername && user.getNickname() != null) {
+            user.setNickname(null);
+        }
+
         user.setLastLogin(currentTime);
         user.setDisplayNick();
         updateCompass(user);
         user.setLeavingHidden(false);
 
-        // Check for new username. If they don't want the message, let's just say it's false.
-        final boolean newUsername = ess.getSettings().isCustomNewUsernameMessage() && lastAccountName != null && !lastAccountName.equals(user.getBase().getName());
-
         if (!ess.getVanishedPlayersNew().isEmpty() && !user.isAuthorized("essentials.vanish.see")) {
             for (final String p : ess.getVanishedPlayersNew()) {
                 final Player toVanish = ess.getServer().getPlayerExact(p);
@@ -453,7 +458,7 @@ private void joinFlow(final User user, final long currentTime, final String mess
         } else if (message == null || hideJoinQuitMessages()) {
             effectiveMessage = null;
         } else if (ess.getSettings().isCustomJoinMessage()) {
-            final String msg = (newUsername ? ess.getSettings().getCustomNewUsernameMessage() : ess.getSettings().getCustomJoinMessage())
+            final String msg = (newUsername && ess.getSettings().isCustomNewUsernameMessage() ? ess.getSettings().getCustomNewUsernameMessage() : ess.getSettings().getCustomJoinMessage())
                     .replace("{PLAYER}", user.getDisplayName()).replace("{USERNAME}", user.getName())
                     .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUsers().getUserCount()))
                     .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size()))

Essentials/src/main/java/com/earth2me/essentials/ISettings.java

@@ -94,6 +94,8 @@ public interface ISettings extends IConf {
 
     String getNicknamePrefix();
 
+    boolean isResetNickOnNameChange();
+
     String getOperatorColor() throws Exception;
 
     boolean getPerWarpPermission();

Essentials/src/main/java/com/earth2me/essentials/Settings.java

@@ -147,6 +147,7 @@ public class Settings implements net.ess3.api.ISettings {
     private boolean logCommandBlockCommands;
     private boolean logConsoleCommands;
     private Set<Predicate<String>> nickBlacklist;
+    private boolean resetNickOnNameChange;
     private double maxProjectileSpeed;
     private boolean removeEffectsOnHeal;
     private Map<String, String> worldAliases;
@@ -508,11 +509,20 @@ private String _getNicknamePrefix() {
         return config.getString("nickname-prefix", "~");
     }
 
+    private boolean _resetNickOnNameChange() {
+        return config.getBoolean("reset-nick-on-name-change", false);
+    }
+
     @Override
     public String getNicknamePrefix() {
         return nicknamePrefix;
     }
 
+    @Override
+    public boolean isResetNickOnNameChange() {
+        return resetNickOnNameChange;
+    }
+
     @Override
     public double getTeleportCooldown() {
         return config.getDouble("teleport-cooldown", 0);
@@ -886,6 +896,7 @@ public void reloadConfig() {
         }
 
         nicknamePrefix = _getNicknamePrefix();
+        resetNickOnNameChange = _resetNickOnNameChange();
         operatorColor = _getOperatorColor();
         changePlayerListName = _changePlayerListName();
         configDebug = _isDebug();

Essentials/src/main/resources/config.yml

@@ -51,6 +51,10 @@ nick-blacklist:
 # For example, if "&6Notch" has 7 characters (2 are part of a color code), a length of 5 is used when this option is set to true.
 ignore-colors-in-max-nick-length: false
 
+# When this option is enabled, any nickname set by a player will be reset when their Minecraft account name changes.
+# This prevents old nicknames (including RGB-formatted ones) from persisting after a name change.
+reset-nick-on-name-change: false
+
 # When this option is enabled, display names for hidden players will not be shown. This prevents players from being
 # able to see that they are online while vanished.
 hide-displayname-in-vanish: true