1 files changed, 122 insertions, 126 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index ab49944d2..cd3977b71 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -1,11 +1,10 @@
 package com.earth2me.essentials.protect;
 
-import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.EssentialsBlockListener;
+import com.earth2me.essentials.IEssentials;
 import com.earth2me.essentials.User;
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
+import java.util.Set;
 import net.minecraft.server.ChunkPosition;
 import net.minecraft.server.Packet60Explosion;
 import org.bukkit.Location;
@@ -18,7 +17,6 @@ import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
@@ -34,11 +32,13 @@ import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
 
 public class EssentialsProtectEntityListener extends EntityListener
 {
-	private EssentialsProtect parent;
+	private final transient IProtect prot;
+	private final transient IEssentials ess;
 
-	public EssentialsProtectEntityListener(EssentialsProtect parent)
+	public EssentialsProtectEntityListener(final IProtect prot)
 	{
-		this.parent = parent;
+		this.prot = prot;
+		this.ess = prot.getEssentials();
 	}
 
 	@Override
@@ -48,30 +48,35 @@ public class EssentialsProtectEntityListener extends EntityListener
 		{
 			return;
 		}
+		final Entity target = event.getEntity();
+		final User user = ess.getUser(target);
 		if (event instanceof EntityDamageByBlockEvent)
 		{
-			DamageCause cause = event.getCause();
+			final DamageCause cause = event.getCause();
 
-			if (EssentialsProtect.playerSettings.get("protect.disable.contactdmg") && cause == DamageCause.CONTACT
-				&& !(event.getEntity() instanceof Player
-					 && Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.contact")
-					 && !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if (prot.getSettingBool(ProtectConfig.disable_contactdmg)
+				&& cause == DamageCause.CONTACT
+				&& !(target instanceof Player
+					 && user.isAuthorized("essentials.protect.damage.contact")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (EssentialsProtect.playerSettings.get("protect.disable.lavadmg") && cause == DamageCause.LAVA
-				&& !(event.getEntity() instanceof Player
-					 && Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.lava")
-					 && !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if (prot.getSettingBool(ProtectConfig.disable_lavadmg)
+				&& cause == DamageCause.LAVA
+				&& !(target instanceof Player
+					 && user.isAuthorized("essentials.protect.damage.lava")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (EssentialsProtect.guardSettings.get("protect.prevent.tnt-explosion") && cause == DamageCause.BLOCK_EXPLOSION
-				&& !(event.getEntity() instanceof Player
-					 && Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.tnt")
-					 && !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if (prot.getSettingBool(ProtectConfig.prevent_tnt_explosion)
+				&& cause == DamageCause.BLOCK_EXPLOSION
+				&& !(target instanceof Player
+					 && user.isAuthorized("essentials.protect.damage.tnt")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
@@ -80,97 +85,90 @@ public class EssentialsProtectEntityListener extends EntityListener
 
 		if (event instanceof EntityDamageByEntityEvent)
 		{
-			EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
-			Entity eAttack = edEvent.getDamager();
-			Entity eDefend = edEvent.getEntity();
+			final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
+			final Entity eAttack = edEvent.getDamager();
+			final User attacker = ess.getUser(eAttack);
 
 			// PVP Settings
-			if (eDefend instanceof Player && eAttack instanceof Player)
+			if (target instanceof Player && eAttack instanceof Player
+				&& prot.getSettingBool(ProtectConfig.disable_pvp)
+				&& (!user.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp")))
 			{
-				if (EssentialsProtect.playerSettings.get("protect.disable.pvp"))
-				{
-					User defender = parent.ess.getUser(eDefend);
-					User attacker = parent.ess.getUser(eAttack);
-
-					if (!defender.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp"))
-					{
-						event.setCancelled(true);
-						return;
-					}
-				}
+				event.setCancelled(true);
+				return;
 			}
+			
 			//Creeper explode prevention
-			if (eAttack != null && eAttack instanceof Monster)
+			if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
+				&& !(target instanceof Player
+					 && user.isAuthorized("essentials.protect.damage.creeper")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
-				if (eAttack instanceof Creeper && EssentialsProtect.guardSettings.get("protect.prevent.creeper-explosion")
-					&& !(event.getEntity() instanceof Player
-						 && Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.creeper")
-						 && !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
-				{
-					event.setCancelled(true);
-					return;
-				}
-
-				if (eAttack instanceof Creeper && EssentialsProtect.guardSettings.get("protect.prevent.creeper-playerdamage")
-					&& !(event.getEntity() instanceof Player
-						 && Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.creeper")
-						 && !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
-				{
-					event.setCancelled(true);
-					return;
-				}
+				event.setCancelled(true);
+				return;
 			}
-		}
 
-		if (event instanceof EntityDamageByProjectileEvent)
-		{
-			if (event.getEntity() instanceof Player
-				&& EssentialsProtect.playerSettings.get("protect.disable.projectiles")
-				&& !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.projectiles")
-				&& !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable"))
+			if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_playerdmg)
+				&& !(target instanceof Player
+					 && user.isAuthorized("essentials.protect.damage.creeper")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
 			}
 		}
 
-		DamageCause cause = event.getCause();
-		Entity casualty = event.getEntity();
-		if (casualty instanceof Player)
+		if (event instanceof EntityDamageByProjectileEvent
+			&& target instanceof Player
+			&& prot.getSettingBool(ProtectConfig.disable_projectiles)
+			&& !(user.isAuthorized("essentials.protect.damage.projectiles")
+				 && !user.isAuthorized("essentials.protect.damage.disable")))
+		{
+			event.setCancelled(true);
+			return;
+		}
+
+		final DamageCause cause = event.getCause();
+		if (target instanceof Player)
 		{
-			if (EssentialsProtect.playerSettings.get("protect.disable.fall") && cause == DamageCause.FALL
-				&& !(Essentials.getStatic().getUser(casualty).isAuthorized("essentials.protect.damage.fall")
-					 && !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if (cause == DamageCause.FALL
+				&& prot.getSettingBool(ProtectConfig.disable_fall)
+				&& !(user.isAuthorized("essentials.protect.damage.fall")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
 			}
 
-			if (EssentialsProtect.playerSettings.get("protect.disable.suffocate") && cause == DamageCause.SUFFOCATION
-				&& !(Essentials.getStatic().getUser(casualty).isAuthorized("essentials.protect.damage.suffocation")
-					 && !Essentials.getStatic().getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if (cause == DamageCause.SUFFOCATION
+				&& prot.getSettingBool(ProtectConfig.disable_suffocate)
+				&& !(user.isAuthorized("essentials.protect.damage.suffocation")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (EssentialsProtect.playerSettings.get("protect.disable.firedmg") && (cause == DamageCause.FIRE
-																					|| cause == DamageCause.FIRE_TICK)
-				&& !(parent.ess.getUser(casualty).isAuthorized("essentials.protect.damage.fire")
-					 && !parent.ess.getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if ((cause == DamageCause.FIRE
+				 || cause == DamageCause.FIRE_TICK)
+				&& prot.getSettingBool(ProtectConfig.disable_firedmg)
+				&& !(user.isAuthorized("essentials.protect.damage.fire")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (EssentialsProtect.playerSettings.get("protect.disable.drown") && cause == DamageCause.DROWNING
-				&& !(parent.ess.getUser(casualty).isAuthorized("essentials.protect.damage.drowning")
-					 && !parent.ess.getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if (cause == DamageCause.DROWNING
+				&& prot.getSettingBool(ProtectConfig.disable_drown)
+				&& !(user.isAuthorized("essentials.protect.damage.drowning")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (EssentialsProtect.playerSettings.get("protect.disable.lightning") && cause == DamageCause.LIGHTNING
-				&& !(parent.ess.getUser(casualty).isAuthorized("essentials.protect.damage.lightning")
-					 && !parent.ess.getUser(event.getEntity()).isAuthorized("essentials.protect.damage.disable")))
+			if (cause == DamageCause.LIGHTNING
+				&& prot.getSettingBool(ProtectConfig.disable_lightning)
+				&& !(user.isAuthorized("essentials.protect.damage.lightning")
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
 			{
 				event.setCancelled(true);
 				return;
@@ -185,58 +183,56 @@ public class EssentialsProtectEntityListener extends EntityListener
 		{
 			return;
 		}
-		if (event.getEntity() instanceof LivingEntity)
+		final int maxHeight = ess.getSettings().getProtectCreeperMaxHeight();
+		//Nicccccccccce plaaacccccccccce..
+		if (event.getEntity() instanceof LivingEntity
+			&& (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
+				|| prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg)
+				|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
 		{
-			//Nicccccccccce plaaacccccccccce..
-			int maxHeight = parent.ess.getSettings().getEpCreeperMaxHeight();
-			if (EssentialsProtect.guardSettings.get("protect.prevent.creeper-explosion")
-				|| EssentialsProtect.guardSettings.get("protect.prevent.creeper-blockdamage")
-				|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))
+			final Set<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size());
+			final Player[] players = ess.getServer().getOnlinePlayers();
+			final Set<ChunkPosition> blocksUnderPlayers = new HashSet<ChunkPosition>(players.length);
+			final Location loc = event.getLocation();
+			for (Player player : players)
 			{
-				HashSet<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size());
-				Player[] players = parent.getServer().getOnlinePlayers();
-				List<ChunkPosition> blocksUnderPlayers = new ArrayList<ChunkPosition>(players.length);
-				final Location loc = event.getLocation();
-				for (Player player : players)
+				if (player.getWorld().equals(loc.getWorld()))
 				{
-					if (player.getWorld().equals(loc.getWorld()))
-					{
-						blocksUnderPlayers.add(
-								new ChunkPosition(
-								player.getLocation().getBlockX(),
-								player.getLocation().getBlockY() - 1,
-								player.getLocation().getBlockZ()));
-					}
+					blocksUnderPlayers.add(
+							new ChunkPosition(
+							player.getLocation().getBlockX(),
+							player.getLocation().getBlockY() - 1,
+							player.getLocation().getBlockZ()));
 				}
-				ChunkPosition cp;
-				for (Block block : event.blockList())
-				{
+			}
+			ChunkPosition cp;
+			for (Block block : event.blockList())
+			{
 				cp = new ChunkPosition(block.getX(), block.getY(), block.getZ());
-					if (!blocksUnderPlayers.contains(cp))
-					{
-						set.add(cp);
-					}
+				if (!blocksUnderPlayers.contains(cp))
+				{
+					set.add(cp);
 				}
-
-				((CraftServer)parent.getServer()).getHandle().a(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,
-																new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
-				event.setCancelled(true);
-				return;
 			}
+
+			((CraftServer)ess.getServer()).getHandle().a(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,
+														  new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
+			event.setCancelled(true);
+			return;
 		}
-		else
-		{ //OH NOES TNT
-			if (EssentialsProtect.guardSettings.get("protect.prevent.tnt-explosion"))
-			{
-				event.setCancelled(true);
-				return;
-			}
+		else if (!(event.getEntity() instanceof LivingEntity)
+				 && prot.getSettingBool(ProtectConfig.prevent_tnt_explosion))
+		{
+			event.setCancelled(true);
+			return;
 		}
 		// This code will prevent explosions near protected rails, signs or protected chests
 		// TODO: Use protect db instead of this code
+
 		for (Block block : event.blockList())
 		{
-			if ((block.getType() == Material.RAILS || block.getFace(BlockFace.UP).getType() == Material.RAILS) && EssentialsProtect.genSettings.get("protect.protect.rails"))
+			if ((block.getType() == Material.RAILS || block.getFace(BlockFace.UP).getType() == Material.RAILS)
+				&& prot.getSettingBool(ProtectConfig.protect_rails))
 			{
 				event.setCancelled(true);
 				return;
@@ -248,7 +244,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				 || block.getFace(BlockFace.WEST).getType() == Material.WALL_SIGN
 				 || block.getType() == Material.SIGN_POST
 				 || block.getFace(BlockFace.UP).getType() == Material.SIGN_POST)
-				&& EssentialsProtect.genSettings.get("protect.protect.signs"))
+				&& prot.getSettingBool(ProtectConfig.protect_signs))
 			{
 				event.setCancelled(true);
 				return;
@@ -263,7 +259,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 	}
 
 	@Override
-	public void onCreatureSpawn(CreatureSpawnEvent event)
+	public void onCreatureSpawn(final CreatureSpawnEvent event)
 	{
 		if (event.getEntity() instanceof CraftPlayer)
 		{
@@ -273,29 +269,29 @@ public class EssentialsProtectEntityListener extends EntityListener
 		{
 			return;
 		}
-		String creatureName = event.getCreatureType().toString().toLowerCase();
+		final String creatureName = event.getCreatureType().toString().toLowerCase();
 		if (creatureName == null || creatureName.isEmpty())
 		{
 			return;
 		}
-		if (EssentialsProtect.guardSettings.get("protect.prevent.spawn." + creatureName))
+		if (ess.getSettings().getProtectPreventSpawn(creatureName))
 		{
 			event.setCancelled(true);
 		}
 	}
-	
+
 	@Override
-	public void onEntityTarget(EntityTargetEvent event)
+	public void onEntityTarget(final EntityTargetEvent event)
 	{
 		if (!(event.getTarget() instanceof Player))
 		{
 			return;
 		}
-		User user = Essentials.getStatic().getUser(event.getTarget());
+		final User user = ess.getUser(event.getTarget());
 		if ((event.getReason() == TargetReason.CLOSEST_PLAYER
 			 || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY
 			 || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET)
-			&& EssentialsProtect.guardSettings.get("protect.prevent.entitytarget")
+			&& prot.getSettingBool(ProtectConfig.prevent_entitytarget)
 			&& !user.isAuthorized("essentials.protect.entitytarget.bypass"))
 		{
 			event.setCancelled(true);