Refactor new username check and join message logic

Author: JRoy

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

@@ -421,11 +421,10 @@ private void joinFlow(final User user, final long currentTime, final String mess
         final String lastAccountName = user.getLastAccountName(); // For comparison
         user.setLastAccountName(user.getBase().getName());
 
-        // 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());
+        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() && lastAccountName != null && !lastAccountName.equals(user.getBase().getName()) && user.getNickname() != null) {
+        if (ess.getSettings().isResetNickOnNameChange() && newUsername && user.getNickname() != null) {
             user.setNickname(null);
         }
 
@@ -459,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()))