Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 08:35:44 +01:00
Code Issues Projects Releases Wiki Activity

Improve nick validation

Browse Source 
Now matches nicks against userdata for conflicts
Now checks for empty string nicknames
This commit is contained in:
KHobbits 2013-10-05 02:31:19 +01:00
parent 122232a0e7
commit 4951c204d2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,14 +30,15 @@ public class Commandnick extends EssentialsLoopCommand
throw new Exception(_("nickDisplayName"));
}
final String[] nickname = formatNickname(user, args[1]).split(" ");
if (args.length > 1 && user.isAuthorized("essentials.nick.others"))
{
final String[] nickname = formatNickname(user, args[1]).split(" ");
loopOfflinePlayers(server, user.getBase(), false, args[0], nickname);
user.sendMessage(_("nickChanged"));
}
else
{
final String[] nickname = formatNickname(user, args[0]).split(" ");
updatePlayer(server, user.getBase(), user, nickname);
}
}
@ -94,23 +95,30 @@ public class Commandnick extends EssentialsLoopCommand
{
throw new Exception(_("nickTooLong"));
}
else if (FormatUtil.stripFormat(newNick).length() < 1)
{
throw new Exception(_("nickNamesAlpha"));
}
return newNick;
}
private boolean nickInUse(final Server server, final User target, String nick)
{
final String lowerNick = nick.toLowerCase(Locale.ENGLISH);
final String lowerNick = FormatUtil.stripFormat(nick.toLowerCase(Locale.ENGLISH));
for (final Player onlinePlayer : server.getOnlinePlayers())
{
if (target.getBase() == onlinePlayer)
{
continue;
}
if (lowerNick.equals(onlinePlayer.getDisplayName().toLowerCase(Locale.ENGLISH))
if (lowerNick.equals(FormatUtil.stripFormat(onlinePlayer.getDisplayName().toLowerCase(Locale.ENGLISH)))
|| lowerNick.equals(onlinePlayer.getName().toLowerCase(Locale.ENGLISH)))
{
return true;
}
}
}
if (ess.getUser(lowerNick) != null) {
return true;
}
return false;
}