Allow for changing of username casing without adding 'nickname' prefix.

khobbits · khobbits · commit 8311da2653e1 · 2014-07-12T16:43:57.000+01:00
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
@@ -300,10 +300,13 @@ public String getNick(final boolean longnick)
 		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
@@ -65,7 +65,7 @@ protected void updatePlayer(final Server server, final CommandSource sender, fin
 		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))
 		{

Original file line number	Diff line number	Diff line change
`@@ -300,10 +300,13 @@ public String getNick(final boolean longnick)`
`300`	`300`	`String nickname;`
`301`	`301`	`String suffix = "";`
`302`	`302`	`final String nick = getNickname();`
`303`		`- if (ess.getSettings().isCommandDisabled("nick") \|\| nick == null \|\| nick.isEmpty() \|\| nick.equalsIgnoreCase(getName()))`
	`303`	`+ if (ess.getSettings().isCommandDisabled("nick") \|\| nick == null \|\| nick.isEmpty() \|\| nick.equals(getName()))`
`304`	`304`	`{`
`305`	`305`	`nickname = getName();`
`306`	`306`	`}`
	`307`	`+ else if (nick.equalsIgnoreCase(getName())) {`
	`308`	`+ nickname = nick;`
	`309`	`+ }`
`307`	`310`	`else`
`308`	`311`	`{`
`309`	`312`	`nickname = ess.getSettings().getNicknamePrefix() + nick;`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected void updatePlayer(final Server server, final CommandSource sender, fin`
`65`	`65`	`if (target.getName().equalsIgnoreCase(nick))`
`66`	`66`	`{`
`67`	`67`	`setNickname(server, sender, target, nick);`
`68`		`- target.sendMessage(tl("nickNoMore"));`
	`68`	`+ target.sendMessage(tl("nickSet", target.getDisplayName()));`
`69`	`69`	`}`
`70`	`70`	`else if ("off".equalsIgnoreCase(nick))`
`71`	`71`	`{`