minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 01:25:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials

Browse Source
This commit is contained in:
KHobbits
2012-01-16 19:42:37 +00:00
parent 6e1a0e538f ebdf2167fe
commit e1f64534b2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.Locale; import java.util.Locale;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -65,9 +66,10 @@ public class Commandnick extends EssentialsCommand
{ {
if (user == null || user.isAuthorized("essentials.nick.color")) if (user == null || user.isAuthorized("essentials.nick.color"))
{ {
return nick.replace('&', '\u00a7').replace("\u00a7\u00a7", "&"); return nick.replace('&', '\u00a7').replaceAll("\u00a7+k", "");
} else {
return Util.stripColor(nick);
} }
return nick;
} }
private void resetAllNicknames(final Server server) private void resetAllNicknames(final Server server)
@@ -86,7 +88,7 @@ public class Commandnick extends EssentialsCommand
private void setNickname(final Server server, final User target, final String nick) throws Exception private void setNickname(final Server server, final User target, final String nick) throws Exception
{ {
if (nick.matches("[^a-zA-Z_0-9]")) if (!nick.matches("^[a-zA-Z_0-9\u00a7]+$"))
{ {
throw new Exception(_("nickNamesAlpha")); throw new Exception(_("nickNamesAlpha"));
} }