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

Compiled regex is faster.

Browse Source
This commit is contained in:
KHobbits 2012-01-18 23:35:30 +00:00
parent 36bc1adf83
commit a10f6850e5
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Essentials/src/com/earth2me/essentials/Util.java
View File

@ -478,7 +478,8 @@ public class Util
} }
return buf.toString(); return buf.toString();
} }
private static transient final Pattern COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-FKa-fk]"); private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-FKa-fk]");
private static transient final Pattern EASY_COLOR_PATTERN = Pattern.compile("&([0-9a-fk])");
public static String stripColor(final String input) public static String stripColor(final String input)
{ {
@ -487,6 +488,16 @@ public class Util
return null; return null;
} }
return COLOR_PATTERN.matcher(input).replaceAll(""); return VANILLA_COLOR_PATTERN.matcher(input).replaceAll("");
}
public static String replaceColor(final String input)
{
if (input == null)
{
return null;
}
return EASY_COLOR_PATTERN.matcher(input).replaceAll("\u00a7$1");
} }
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandme.java
View File

@ -29,7 +29,7 @@ public class Commandme extends EssentialsCommand
String message = getFinalArg(args, 0); String message = getFinalArg(args, 0);
if (user.isAuthorized("essentials.chat.color")) if (user.isAuthorized("essentials.chat.color"))
{ {
message = message.replaceAll("&([0-9a-fk])", "§$1"); message = Util.replaceColor(message);
} }
else { else {
message = Util.stripColor(message); message = Util.stripColor(message);

4
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View File

@ -36,7 +36,7 @@ public class Commandmsg extends EssentialsCommand
} }
if (user.isAuthorized("essentials.msg.color")) if (user.isAuthorized("essentials.msg.color"))
{ {
message = message.replaceAll("&([0-9a-fk])", "§$1"); message = Util.replaceColor(message);
} }
else else
{ {
@ -45,7 +45,7 @@ public class Commandmsg extends EssentialsCommand
} }
else else
{ {
message = message.replaceAll("&([0-9a-fk])", "§$1"); message = Util.replaceColor(message);
} }
final String translatedMe = _("me"); final String translatedMe = _("me");

4
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View File

@ -34,7 +34,7 @@ public class Commandr extends EssentialsCommand
User user = ess.getUser(sender); User user = ess.getUser(sender);
if (user.isAuthorized("essentials.msg.color")) if (user.isAuthorized("essentials.msg.color"))
{ {
message = message.replaceAll("&([0-9a-fk])", "§$1"); message = Util.replaceColor(message);
} }
else else
{ {
@ -45,7 +45,7 @@ public class Commandr extends EssentialsCommand
} }
else else
{ {
message = message.replaceAll("&([0-9a-fk])", "§$1"); message = Util.replaceColor(message);
replyTo = Console.getConsoleReplyTo(); replyTo = Console.getConsoleReplyTo();
senderName = Console.NAME; senderName = Console.NAME;
} }

2
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
View File

@ -36,7 +36,7 @@ public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer
*/ */
if (user.isAuthorized("essentials.chat.color")) if (user.isAuthorized("essentials.chat.color"))
{ {
event.setMessage(event.getMessage().replaceAll("&([0-9a-fk])", "\u00a7$1")); event.setMessage(Util.replaceColor(event.getMessage()));
} }
else else
{ {