summaryrefslogtreecommitdiffstats
path: root/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java
diff options
context:
space:
mode:
Diffstat (limited to 'EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java')
-rw-r--r--EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java49
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);
}
}
}