From 7f5f98a997c722507d28e545d94e297f993024a5 Mon Sep 17 00:00:00 2001 From: Deltric Date: Wed, 30 Mar 2022 04:38:40 -0500 Subject: [PATCH 1/2] Fixes nickname off for color only nickname (#4822) --- .../java/com/earth2me/essentials/commands/Commandnick.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java index ede620a2b52..bc560d309b0 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java @@ -63,6 +63,9 @@ protected void updatePlayer(final Server server, final CommandSource sender, fin } private String formatNickname(final User user, final String nick) throws Exception { + if("off".equalsIgnoreCase(nick)) { + return nick; + } final String newNick = user == null ? FormatUtil.replaceFormat(nick) : FormatUtil.formatString(user, "essentials.nick", nick); if (!newNick.matches("^[a-zA-Z_0-9" + ChatColor.COLOR_CHAR + "]+$") && user != null && !user.isAuthorized("essentials.nick.allowunsafe")) { throw new Exception(tl("nickNamesAlpha")); From a97cf0ce9bc12c2bc87e61e217fed86cc102d5d5 Mon Sep 17 00:00:00 2001 From: Deltric Date: Wed, 30 Mar 2022 04:48:04 -0500 Subject: [PATCH 2/2] Made the placement check cleaner I'm not sure why I didn't think of this in the first place :thinking: --- .../java/com/earth2me/essentials/commands/Commandnick.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java index bc560d309b0..d82c9bb4d35 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java @@ -63,9 +63,6 @@ protected void updatePlayer(final Server server, final CommandSource sender, fin } private String formatNickname(final User user, final String nick) throws Exception { - if("off".equalsIgnoreCase(nick)) { - return nick; - } final String newNick = user == null ? FormatUtil.replaceFormat(nick) : FormatUtil.formatString(user, "essentials.nick", nick); if (!newNick.matches("^[a-zA-Z_0-9" + ChatColor.COLOR_CHAR + "]+$") && user != null && !user.isAuthorized("essentials.nick.allowunsafe")) { throw new Exception(tl("nickNamesAlpha")); @@ -73,7 +70,7 @@ private String formatNickname(final User user, final String nick) throws Excepti throw new Exception(tl("nickTooLong")); } else if (FormatUtil.stripFormat(newNick).length() < 1) { throw new Exception(tl("nickNamesAlpha")); - } else if (user != null && user.isAuthorized("essentials.nick.changecolors") && !user.isAuthorized("essentials.nick.changecolors.bypass") && !FormatUtil.stripFormat(newNick).equals(user.getName())) { + } else if (user != null && user.isAuthorized("essentials.nick.changecolors") && !user.isAuthorized("essentials.nick.changecolors.bypass") && !FormatUtil.stripFormat(newNick).equals(user.getName()) && !nick.equalsIgnoreCase("off")) { throw new Exception(tl("nickNamesOnlyColorChanges")); } else if (user != null && !user.isAuthorized("essentials.nick.blacklist.bypass") && isNickBanned(newNick)) { throw new Exception(tl("nickNameBlacklist", nick));