TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-05-25 08:53:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix /nick command colors

Browse source
This commit is contained in:
snowleo 2012-01-16 20:38:53 +01:00
parent 26d63f3666
commit 813e66b4f2
1 changed files with 5 additions and 3 deletions
Show stats 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"));
} }