diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 5 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandnick.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 82eca3d3d..7e0921739 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -300,10 +300,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es String nickname; String suffix = ""; final String nick = getNickname(); - if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equalsIgnoreCase(getName())) + if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName())) { nickname = getName(); } + else if (nick.equalsIgnoreCase(getName())) { + nickname = nick; + } else { nickname = ess.getSettings().getNicknamePrefix() + nick; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java index 45fe4ce7e..e9e258085 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java @@ -65,7 +65,7 @@ public class Commandnick extends EssentialsLoopCommand if (target.getName().equalsIgnoreCase(nick)) { setNickname(server, sender, target, nick); - target.sendMessage(tl("nickNoMore")); + target.sendMessage(tl("nickSet", target.getDisplayName())); } else if ("off".equalsIgnoreCase(nick)) { |