diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-07-29 17:16:10 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-07-29 17:16:10 +0100 |
commit | 0badd09ad36227d357a2ebe05d002de59c715ae6 (patch) | |
tree | b640906e05056ecfd0c2dda5e6ec4159718679e6 | |
parent | cfc8faa43aa43ff18a58c047b8d3fb579f8dc034 (diff) | |
parent | b0586abc67eaa970a2e36b285acd81c7bb3d572b (diff) | |
download | Essentials-0badd09ad36227d357a2ebe05d002de59c715ae6.tar Essentials-0badd09ad36227d357a2ebe05d002de59c715ae6.tar.gz Essentials-0badd09ad36227d357a2ebe05d002de59c715ae6.tar.lz Essentials-0badd09ad36227d357a2ebe05d002de59c715ae6.tar.xz Essentials-0badd09ad36227d357a2ebe05d002de59c715ae6.zip |
Merge branch '2.9' of github.com:essentials/Essentials into 2.9
-rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java | 13 |
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()) { |