summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-07-29 17:16:10 +0100
committerKHobbits <rob@khobbits.co.uk>2012-07-29 17:16:10 +0100
commita49218a718ad9b48fafadcbc485c6553fdf6e8c1 (patch)
treeb2d5242b74bb493560999270ab5a2288b5cf2413
parent6542b7b7e96c571365e7056b97350a6fadfccd37 (diff)
parent6f77466f3a3831f72cc098e72ea3b23317d45838 (diff)
downloadEssentials-a49218a718ad9b48fafadcbc485c6553fdf6e8c1.tar
Essentials-a49218a718ad9b48fafadcbc485c6553fdf6e8c1.tar.gz
Essentials-a49218a718ad9b48fafadcbc485c6553fdf6e8c1.tar.lz
Essentials-a49218a718ad9b48fafadcbc485c6553fdf6e8c1.tar.xz
Essentials-a49218a718ad9b48fafadcbc485c6553fdf6e8c1.zip
Merge branch '2.9' of github.com:essentials/Essentials into 2.9
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
index c159510c7..162457baf 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
@@ -75,8 +75,8 @@ public class SignBlockListener implements Listener
return false;
}
- @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
- public void onSignChange(final SignChangeEvent event)
+ @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+ public void onSignChange2(final SignChangeEvent event)
{
if (ess.getSettings().areSignsDisabled())
{
@@ -88,6 +88,15 @@ public class SignBlockListener implements Listener
{
event.setLine(i, Util.formatString(user, "essentials.signs", event.getLine(i)));
}
+ }
+
+ @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+ public void onSignChange(final SignChangeEvent event)
+ {
+ if (ess.getSettings().areSignsDisabled())
+ {
+ return;
+ }
for (Signs signs : Signs.values())
{