From 4c1f1b74fa3b97a6ebe14a99cb7355225b61d00c Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Thu, 7 Jul 2022 23:11:07 +0200
Subject: [PATCH 1/2] Fix nickname feedback message when change-displayname is
 off

---
 .../main/java/com/earth2me/essentials/commands/Commandnick.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d82c9bb4d35..356a8b329ee 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java
@@ -58,7 +58,7 @@ protected void updatePlayer(final Server server, final CommandSource sender, fin
             throw new NotEnoughArgumentsException(tl("nickInUse"));
         } else {
             setNickname(server, sender, target, nick);
-            target.sendMessage(tl("nickSet", target.getDisplayName()));
+            target.sendMessage(tl("nickSet", ess.getSettings().changeDisplayName() ? target.getDisplayName() : nick));
         }
     }
 

From f0af4c17b21052c2570917e9ca388c955af7679a Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Fri, 8 Jul 2022 19:59:54 +0200
Subject: [PATCH 2/2] Also change this message

---
 .../main/java/com/earth2me/essentials/commands/Commandnick.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 356a8b329ee..699fef7130d 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java
@@ -53,7 +53,7 @@ protected void updatePlayer(final Server server, final CommandSource sender, fin
             if (!target.getDisplayName().equalsIgnoreCase(target.getDisplayName())) {
                 target.sendMessage(tl("nickNoMore"));
             }
-            target.sendMessage(tl("nickSet", target.getDisplayName()));
+            target.sendMessage(tl("nickSet", ess.getSettings().changeDisplayName() ? target.getDisplayName() : nick));
         } else if (nickInUse(target, nick)) {
             throw new NotEnoughArgumentsException(tl("nickInUse"));
         } else {