diff options
| author | snowleo <schneeleo@gmail.com> | 2012-01-16 20:38:53 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-01-16 20:38:53 +0100 |
| commit | 813e66b4f2f2759065f98c5f472bad9a0e0bf2db (patch) | |
| tree | bd9ec7e1af8e6b03007709d6f7abcef7cce1e9b5 | |
| parent | 26d63f36668cd111706f6406f0d10f8d08197020 (diff) | |
| download | Essentials-813e66b4f2f2759065f98c5f472bad9a0e0bf2db.tar Essentials-813e66b4f2f2759065f98c5f472bad9a0e0bf2db.tar.gz Essentials-813e66b4f2f2759065f98c5f472bad9a0e0bf2db.tar.lz Essentials-813e66b4f2f2759065f98c5f472bad9a0e0bf2db.tar.xz Essentials-813e66b4f2f2759065f98c5f472bad9a0e0bf2db.zip | |
Fix /nick command colors
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandnick.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java index 95ad5ea84..b9fbccb37 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java @@ -2,6 +2,7 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import java.util.Locale; import org.bukkit.Server; import org.bukkit.command.CommandSender; @@ -65,9 +66,10 @@ public class Commandnick extends EssentialsCommand { 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) @@ -86,7 +88,7 @@ public class Commandnick extends EssentialsCommand 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")); } |