Major cleanup of the Protect code

1 files changed, 14 insertions, 24 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
index 901d3d8c7..e81efc72b 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
@@ -8,53 +8,43 @@ import org.bukkit.event.weather.WeatherListener;
 
 public class EssentialsProtectWeatherListener extends WeatherListener
 {
-	private EssentialsProtect parent;
+	private final transient IProtect prot;
 
-	public EssentialsProtectWeatherListener(EssentialsProtect parent)
+	public EssentialsProtectWeatherListener(final IProtect prot)
 	{
-		this.parent = parent;
+		this.prot = prot;
 	}
 
 	@Override
-	public void onWeatherChange(WeatherChangeEvent event)
+	public void onWeatherChange(final WeatherChangeEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		if (EssentialsProtect.playerSettings.get("protect.disable.weather.storm") && event.toWeatherState())
+		if (!event.isCancelled()
+			&& prot.getSettingBool(ProtectConfig.disable_weather_storm)
+			&& event.toWeatherState())
 		{
 			event.setCancelled(true);
-			return;
 		}
 
 	}
 
 	@Override
-	public void onLightningStrike(LightningStrikeEvent event)
+	public void onLightningStrike(final LightningStrikeEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		if (EssentialsProtect.playerSettings.get("protect.disable.weather.lightning"))
+		if (!event.isCancelled()
+			&& prot.getSettingBool(ProtectConfig.disable_weather_lightning))
 		{
 			event.setCancelled(true);
-			return;
 		}
 	}
 
 	@Override
-	public void onThunderChange(ThunderChangeEvent event)
+	public void onThunderChange(final ThunderChangeEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		if (EssentialsProtect.playerSettings.get("protect.disable.weather.thunder") && event.toThunderState())
+		if (!event.isCancelled()
+			&& prot.getSettingBool(ProtectConfig.disable_weather_thunder)
+			&& event.toThunderState())
 		{
 			event.setCancelled(true);
-			return;
 		}
 	}
 }