diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-03-22 22:26:04 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-03-22 22:26:04 +0000 |
| commit | 4ddd7a4bb187a2dd3b3f3d2564e9d2bc8bdbd5e5 (patch) | |
| tree | a88ccda80844e426f1d969d860df075990de434d | |
| parent | 1002a5a9024944cf31772890d51d01fd99ac5983 (diff) | |
| download | Essentials-4ddd7a4bb187a2dd3b3f3d2564e9d2bc8bdbd5e5.tar Essentials-4ddd7a4bb187a2dd3b3f3d2564e9d2bc8bdbd5e5.tar.gz Essentials-4ddd7a4bb187a2dd3b3f3d2564e9d2bc8bdbd5e5.tar.lz Essentials-4ddd7a4bb187a2dd3b3f3d2564e9d2bc8bdbd5e5.tar.xz Essentials-4ddd7a4bb187a2dd3b3f3d2564e9d2bc8bdbd5e5.zip | |
Split formatting perms for signs as well.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Util.java | 16 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java | 15 |
2 files changed, 11 insertions, 20 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java index d387cad56..53ee4b8f3 100644 --- a/Essentials/src/com/earth2me/essentials/Util.java +++ b/Essentials/src/com/earth2me/essentials/Util.java @@ -547,6 +547,14 @@ public class Util { message = Util.stripColor(input, VANILLA_COLOR_PATTERN); } + if (user.isAuthorized(permBase + ".magic")) + { + message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN); + } + else + { + message = Util.stripColor(message, VANILLA_MAGIC_PATTERN); + } if (user.isAuthorized(permBase + ".format")) { message = Util.replaceColor(message, REPLACE_FORMAT_PATTERN); @@ -565,14 +573,6 @@ public class Util return null; } String message = formatString(user, permBase, input); - if (user.isAuthorized(permBase + ".magic")) - { - message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN); - } - else - { - message = Util.stripColor(message, VANILLA_MAGIC_PATTERN); - } if (!user.isAuthorized(permBase + ".url")) { message = Util.blockURL(message); diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java index fc020aa88..8acca9804 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java @@ -84,19 +84,10 @@ public class SignBlockListener implements Listener return; } User user = ess.getUser(event.getPlayer()); - if (user.isAuthorized("essentials.signs.color")) - { - for (int i = 0; i < 4; i++) - { - event.setLine(i, Util.replaceFormat(event.getLine(i))); - } - } - else + + for (int i = 0; i < 4; i++) { - for (int i = 0; i < 4; i++) - { - event.setLine(i, Util.stripFormat(event.getLine(i))); - } + event.setLine(i, Util.formatString(user, "essentials.signs", event.getLine(i))); } for (Signs signs : Signs.values()) |