diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-03-09 14:24:19 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-03-09 14:24:19 +0000 |
commit | 65e883b975181da1ea31cce014a669f8443c6a5d (patch) | |
tree | 87d8e1652d1c4e7c75de01f900c971efbf7e4d28 | |
parent | 36e1fa22cbcae9020fa86c673ca37a842ea5cf8e (diff) | |
download | Essentials-65e883b975181da1ea31cce014a669f8443c6a5d.tar Essentials-65e883b975181da1ea31cce014a669f8443c6a5d.tar.gz Essentials-65e883b975181da1ea31cce014a669f8443c6a5d.tar.lz Essentials-65e883b975181da1ea31cce014a669f8443c6a5d.tar.xz Essentials-65e883b975181da1ea31cce014a669f8443c6a5d.zip |
[Fix] Allow /nick to change nickname case, without adding prefix character.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 2 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandnick.java | 20 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 5d5661646..471362b7b 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -283,7 +283,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser String nickname; String suffix = ""; final String nick = getNickname(); - if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName())) + if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equalsIgnoreCase(getName())) { nickname = getName(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java index 808e0be70..749b7a9ad 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java @@ -94,7 +94,13 @@ public class Commandnick extends EssentialsCommand { throw new Exception(_("nickNamesAlpha")); } - else if ("off".equalsIgnoreCase(nick) || target.getName().equalsIgnoreCase(nick)) + else if (target.getName().equalsIgnoreCase(nick)) + { + target.setNickname(nick); + target.setDisplayNick(); + target.sendMessage(_("nickNoMore")); + } + else if ("off".equalsIgnoreCase(nick)) { target.setNickname(null); target.setDisplayNick(); @@ -102,16 +108,16 @@ public class Commandnick extends EssentialsCommand } else { - for (Player p : server.getOnlinePlayers()) + for (Player onlinePlayer : server.getOnlinePlayers()) { - if (target.getBase() == p) + if (target.getBase() == onlinePlayer) { continue; } - String dn = p.getDisplayName().toLowerCase(Locale.ENGLISH); - String n = p.getName().toLowerCase(Locale.ENGLISH); - String nk = nick.toLowerCase(Locale.ENGLISH); - if (nk.equals(dn) || nk.equals(n)) + String displayName = onlinePlayer.getDisplayName().toLowerCase(Locale.ENGLISH); + String name = onlinePlayer.getName().toLowerCase(Locale.ENGLISH); + String lowerNick = nick.toLowerCase(Locale.ENGLISH); + if (lowerNick.equals(displayName) || lowerNick.equals(name)) { throw new Exception(_("nickInUse")); } |