Merge branch '2.9' of github.com:essentials/Essentials into 2.9

This commit is contained in:
KHobbits 2012-07-29 17:16:10 +01:00
commit 0badd09ad3

View File

@ -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())
{