Still give 'nickNoMore' message when removing a nickname.

1 files changed, 8 insertions, 2 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
index e9e258085..366b525e0 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
@@ -64,7 +64,12 @@ public class Commandnick extends EssentialsLoopCommand
 		final String nick = args[0];
 		if (target.getName().equalsIgnoreCase(nick))
 		{
+			String oldName = target.getDisplayName();
 			setNickname(server, sender, target, nick);
+			if (!target.getDisplayName().equalsIgnoreCase(oldName))
+			{
+				target.sendMessage(tl("nickNoMore"));
+			}
 			target.sendMessage(tl("nickSet", target.getDisplayName()));
 		}
 		else if ("off".equalsIgnoreCase(nick))
@@ -117,8 +122,9 @@ public class Commandnick extends EssentialsLoopCommand
 				return true;
 			}
 		}
-		if (ess.getUser(lowerNick) != null && ess.getUser(lowerNick) != target) {
-				return true;
+		if (ess.getUser(lowerNick) != null && ess.getUser(lowerNick) != target)
+		{
+			return true;
 		}
 		return false;
 	}