diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-09-19 21:07:50 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-09-19 21:07:50 +0100 |
commit | 27ea33d82b68a95b1d5747609ed300cba1546910 (patch) | |
tree | 95077aeeee833d8818d897ac553d13248181b19d /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java | |
parent | 654e70e436001c9c1cf1a9758773b37ce6e8faa0 (diff) | |
download | Essentials-27ea33d82b68a95b1d5747609ed300cba1546910.tar Essentials-27ea33d82b68a95b1d5747609ed300cba1546910.tar.gz Essentials-27ea33d82b68a95b1d5747609ed300cba1546910.tar.lz Essentials-27ea33d82b68a95b1d5747609ed300cba1546910.tar.xz Essentials-27ea33d82b68a95b1d5747609ed300cba1546910.zip |
ignoreCancelled events.
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java')
-rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java index 1b8dd19ff..1e5fa6da3 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java @@ -17,11 +17,10 @@ public class EssentialsProtectWeatherListener implements Listener this.prot = prot; } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onWeatherChange(final WeatherChangeEvent event) { - if (!event.isCancelled() - && prot.getSettingBool(ProtectConfig.disable_weather_storm) + if (prot.getSettingBool(ProtectConfig.disable_weather_storm) && event.toWeatherState()) { event.setCancelled(true); @@ -29,21 +28,19 @@ public class EssentialsProtectWeatherListener implements Listener } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onLightningStrike(final LightningStrikeEvent event) { - if (!event.isCancelled() - && prot.getSettingBool(ProtectConfig.disable_weather_lightning)) + if (prot.getSettingBool(ProtectConfig.disable_weather_lightning)) { event.setCancelled(true); } } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onThunderChange(final ThunderChangeEvent event) { - if (!event.isCancelled() - && prot.getSettingBool(ProtectConfig.disable_weather_thunder) + if (prot.getSettingBool(ProtectConfig.disable_weather_thunder) && event.toThunderState()) { event.setCancelled(true); |