diff options
author | snowleo <schneeleo@gmail.com> | 2012-10-06 16:49:40 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-10-06 16:49:40 +0200 |
commit | fabd88dc2585bf6798658f34a7ee122225316fe8 (patch) | |
tree | cdda3fad01567f042d5afbaa189ac12ef94f2b7e /EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java | |
parent | 463c4ff62db553fc980545665a332ef7bbecdcc6 (diff) | |
download | Essentials-fabd88dc2585bf6798658f34a7ee122225316fe8.tar Essentials-fabd88dc2585bf6798658f34a7ee122225316fe8.tar.gz Essentials-fabd88dc2585bf6798658f34a7ee122225316fe8.tar.lz Essentials-fabd88dc2585bf6798658f34a7ee122225316fe8.tar.xz Essentials-fabd88dc2585bf6798658f34a7ee122225316fe8.zip |
Less locks please
Diffstat (limited to 'EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java')
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java | 49 |
1 files changed, 14 insertions, 35 deletions
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java index 6f08bdd13..1f71944a0 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java @@ -21,19 +21,12 @@ public class EssentialsProtectWeatherListener implements Listener public void onWeatherChange(final WeatherChangeEvent event) { final ProtectHolder settings = prot.getSettings(); - settings.acquireReadLock(); - try - { - if (!event.isCancelled() - && settings.getData().isDisableStorm() - && event.toWeatherState()) - { - event.setCancelled(true); - } - } - finally + + if (!event.isCancelled() + && settings.getData().isDisableStorm() + && event.toWeatherState()) { - settings.unlock(); + event.setCancelled(true); } } @@ -41,18 +34,11 @@ public class EssentialsProtectWeatherListener implements Listener public void onLightningStrike(final LightningStrikeEvent event) { final ProtectHolder settings = prot.getSettings(); - settings.acquireReadLock(); - try - { - if (!event.isCancelled() - && settings.getData().isDisableLighting()) - { - event.setCancelled(true); - } - } - finally + + if (!event.isCancelled() + && settings.getData().isDisableLighting()) { - settings.unlock(); + event.setCancelled(true); } } @@ -60,19 +46,12 @@ public class EssentialsProtectWeatherListener implements Listener public void onThunderChange(final ThunderChangeEvent event) { final ProtectHolder settings = prot.getSettings(); - settings.acquireReadLock(); - try - { - if (!event.isCancelled() - && settings.getData().isDisableThunder() - && event.toThunderState()) - { - event.setCancelled(true); - } - } - finally + + if (!event.isCancelled() + && settings.getData().isDisableThunder() + && event.toThunderState()) { - settings.unlock(); + event.setCancelled(true); } } } |