Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-06-28 15:45:07 +02:00
Code Issues Projects Releases Wiki Activity

[Fix] Allow /nick to change nickname case, without adding prefix character.

Browse Source
This commit is contained in:
KHobbits 2013-03-09 14:24:19 +00:00
parent 46e9471a63
commit b1f427d52e
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/User.java
View File

@ -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();
}

20
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View File

@ -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"));
}