Merge branch 'master' of git@git.coding.net:502647092/Residence-Fix.git

.classpath

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/Essentials.jar"/>
+	<classpathentry kind="lib" path="lib/Vault.jar"/>
+	<classpathentry kind="lib" path="lib/WorldEdit.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

@@ -1,8 +1,3 @@
-# Eclipse stuff
-/.classpath
-/.project
-/.settings
-
 # netbeans
 /nbproject
 

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Residence-Fix</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

src/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java

@@ -4,6 +4,7 @@
  */
 
 package com.bekvon.bukkit.residence.listeners;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 
@@ -64,44 +65,56 @@ import org.bukkit.event.hanging.HangingPlaceEvent;
  */
 public class ResidenceEntityListener implements Listener {
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onEndermanChangeBlock(EntityChangeBlockEvent event) {
-        if (event.getEntityType() != EntityType.ENDERMAN && event.getEntityType() != EntityType.WITHER) {
-            return;
-        }
-        FlagPermissions perms = Residence.getPermsByLoc(event.getBlock().getLocation());
-        FlagPermissions world = Residence.getWorldFlags().getPerms(event.getBlock().getWorld().getName());
-        if (event.getEntityType() == EntityType.WITHER) {
-            if (!perms.has("wither", perms.has("explode", world.has("wither", world.has("explode", true))))) {
-                event.setCancelled(true);
-            }
-        } else if (!perms.has("build", true)) {
-            event.setCancelled(true);
-        }
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onEndermanChangeBlock(EntityChangeBlockEvent event) {
+		if (event.getEntityType() != EntityType.ENDERMAN
+				&& event.getEntityType() != EntityType.WITHER) {
+			return;
+		}
+		FlagPermissions perms = Residence.getPermsByLoc(event.getBlock()
+				.getLocation());
+		FlagPermissions world = Residence.getWorldFlags().getPerms(
+				event.getBlock().getWorld().getName());
+		if (event.getEntityType() == EntityType.WITHER) {
+			if (!perms.has(
+					"wither",
+					perms.has("explode",
+							world.has("wither", world.has("explode", true))))) {
+				event.setCancelled(true);
+			}
+		} else if (!perms.has("build", true)) {
+			event.setCancelled(true);
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onEntityInteract(EntityInteractEvent event){
-    	Block block = event.getBlock();
-    	Material mat = block.getType();
-    	Entity entity = event.getEntity();    	
-    	FlagPermissions perms = Residence.getPermsByLoc(block.getLocation());
-    	boolean hastrample = perms.has("trample", perms.has("hasbuild", true));     			
-    	if(!hastrample && !(entity.getType() == EntityType.FALLING_BLOCK) && (mat == Material.SOIL || mat == Material.SOUL_SAND)){
-    		event.setCancelled(true);
-    	}
-    }
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onEntityInteract(EntityInteractEvent event) {
+		Block block = event.getBlock();
+		Material mat = block.getType();
+		Entity entity = event.getEntity();
+		FlagPermissions perms = Residence.getPermsByLoc(block.getLocation());
+		boolean hastrample = perms.has("trample", perms.has("hasbuild", true));
+		if (!hastrample && !(entity.getType() == EntityType.FALLING_BLOCK)
+				&& (mat == Material.SOIL || mat == Material.SOUL_SAND)) {
+			event.setCancelled(true);
+		}
+	}
 
-    private boolean isMonster(Entity ent) {
-    	return (ent instanceof Monster || ent instanceof Slime || ent instanceof Ghast);
-    }
+	private boolean isMonster(Entity ent) {
+		return (ent instanceof Monster || ent instanceof Slime || ent instanceof Ghast);
+	}
 
-    private boolean isAnimal(Entity ent) {
-    	return (ent instanceof Horse || ent instanceof Bat || ent instanceof Snowman || ent instanceof IronGolem || ent instanceof Ocelot || ent instanceof Pig || ent instanceof Sheep || ent instanceof Chicken || ent instanceof Wolf || ent instanceof Cow || ent instanceof Squid || ent instanceof Villager || ent instanceof Rabbit);
-    }
+	private boolean isAnimal(Entity ent) {
+		return (ent instanceof Horse || ent instanceof Bat
+				|| ent instanceof Snowman || ent instanceof IronGolem
+				|| ent instanceof Ocelot || ent instanceof Pig
+				|| ent instanceof Sheep || ent instanceof Chicken
+				|| ent instanceof Wolf || ent instanceof Cow
+				|| ent instanceof Squid || ent instanceof Villager || ent instanceof Rabbit);
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void AnimalKilling (EntityDamageByEntityEvent event){
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void AnimalKilling(EntityDamageByEntityEvent event) {
 		Entity damager = event.getDamager();
 
 		if ((!(damager instanceof Arrow)) && (!(damager instanceof Player))) {
@@ -109,7 +122,8 @@ public class ResidenceEntityListener implements Listener {
 		}
 
 		Player cause;
-		if ((damager instanceof Arrow) && (!(((Arrow) damager).getShooter() instanceof Player))) {
+		if ((damager instanceof Arrow)
+				&& (!(((Arrow) damager).getShooter() instanceof Player))) {
 			return;
 
 		} else if (damager instanceof Player) {
@@ -123,283 +137,346 @@ public class ResidenceEntityListener implements Listener {
 		}
 
 		Entity entity = event.getEntity();
-		ClaimedResidence res = Residence.getResidenceManager().getByLoc(entity.getLocation());
+		ClaimedResidence res = Residence.getResidenceManager().getByLoc(
+				entity.getLocation());
 
-		if (res != null && !res.getPermissions().playerHas(cause.getName(), "animalkilling", true)) {
+		if (res != null
+				&& !res.getPermissions().playerHas(cause.getName(),
+						"animalkilling", true)) {
 			if (isAnimal(entity)) {
-				cause.sendMessage(ChatColor.RED + Residence.getLanguage().getPhrase("NoPermission"));
+				cause.sendMessage(ChatColor.RED
+						+ Residence.getLanguage().getPhrase("NoPermission"));
 				event.setCancelled(true);
 			}
 		}
 	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onCreatureSpawn(CreatureSpawnEvent event) {
-        FlagPermissions perms = Residence.getPermsByLoc(event.getLocation());
-        Entity ent = event.getEntity();
-        if(isAnimal(ent)){
-        	if(!perms.has("animals", true)){
-        		event.setCancelled(true);
-        	}
-        } else {
-        	if (!perms.has("monsters", true) && isMonster(ent)) {
-        		event.setCancelled(true);
-        	}
-        }
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onCreatureSpawn(CreatureSpawnEvent event) {
+		FlagPermissions perms = Residence.getPermsByLoc(event.getLocation());
+		Entity ent = event.getEntity();
+		if (isAnimal(ent)) {
+			if (!perms.has("animals", true)) {
+				event.setCancelled(true);
+			}
+		} else {
+			if (!perms.has("monsters", true) && isMonster(ent)) {
+				event.setCancelled(true);
+			}
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onHangingPlace(HangingPlaceEvent event) {
-        Player player = event.getPlayer();
-        if (Residence.isResAdminOn(player)) {
-            return;
-        }
-        FlagPermissions perms = Residence.getPermsByLocForPlayer(event.getEntity().getLocation(), player);
-        String pname = player.getName();
-        String world = player.getWorld().getName();
-        if (!perms.playerHas(pname, world, "place", perms.playerHas(pname, world, "build", true))) {
-            event.setCancelled(true);
-            player.sendMessage(ChatColor.RED + Residence.getLanguage().getPhrase("NoPermission"));
-        }
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onHangingPlace(HangingPlaceEvent event) {
+		Player player = event.getPlayer();
+		if (Residence.isResAdminOn(player)) {
+			return;
+		}
+		FlagPermissions perms = Residence.getPermsByLocForPlayer(event
+				.getEntity().getLocation(), player);
+		String pname = player.getName();
+		String world = player.getWorld().getName();
+		if (!perms.playerHas(pname, world, "place",
+				perms.playerHas(pname, world, "build", true))) {
+			event.setCancelled(true);
+			player.sendMessage(ChatColor.RED
+					+ Residence.getLanguage().getPhrase("NoPermission"));
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onHangingBreak(HangingBreakEvent event) {
-        if (event instanceof HangingBreakByEntityEvent) {
-            HangingBreakByEntityEvent evt = (HangingBreakByEntityEvent) event;
-            if (evt.getRemover() instanceof Player) {
-                Player player = (Player) evt.getRemover();
-                if (Residence.isResAdminOn(player)) {
-                    return;
-                }
-                String pname = player.getName();
-                FlagPermissions perms = Residence.getPermsByLocForPlayer(event.getEntity().getLocation(), player);
-                String world = event.getEntity().getWorld().getName();
-                if (!perms.playerHas(pname, world, "destroy", perms.playerHas(pname, world, "build", true))) {
-                    event.setCancelled(true);
-                    player.sendMessage(ChatColor.RED + Residence.getLanguage().getPhrase("NoPermission"));
-                }
-            }
-        }
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onHangingBreak(HangingBreakEvent event) {
+		if (event instanceof HangingBreakByEntityEvent) {
+			HangingBreakByEntityEvent evt = (HangingBreakByEntityEvent) event;
+			if (evt.getRemover() instanceof Player) {
+				Player player = (Player) evt.getRemover();
+				if (Residence.isResAdminOn(player)) {
+					return;
+				}
+				String pname = player.getName();
+				FlagPermissions perms = Residence.getPermsByLocForPlayer(event
+						.getEntity().getLocation(), player);
+				String world = event.getEntity().getWorld().getName();
+				if (!perms.playerHas(pname, world, "destroy",
+						perms.playerHas(pname, world, "build", true))) {
+					event.setCancelled(true);
+					player.sendMessage(ChatColor.RED
+							+ Residence.getLanguage().getPhrase("NoPermission"));
+				}
+			}
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onEntityCombust(EntityCombustEvent event) {
-        FlagPermissions perms = Residence.getPermsByLoc(event.getEntity().getLocation());
-        if (!perms.has("burn", true)) {
-            event.setCancelled(true);
-        }
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onEntityCombust(EntityCombustEvent event) {
+		FlagPermissions perms = Residence.getPermsByLoc(event.getEntity()
+				.getLocation());
+		if (!perms.has("burn", true)) {
+			event.setCancelled(true);
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onExplosionPrime(ExplosionPrimeEvent event) {
-        EntityType entity = event.getEntityType();
-        FlagPermissions perms = Residence.getPermsByLoc(event.getEntity().getLocation());
-        if (entity == EntityType.CREEPER) {
-            if (!perms.has("creeper", perms.has("explode", true))) {
-                event.setCancelled(true);
-                event.getEntity().remove();
-            }
-        }
-        if (entity == EntityType.PRIMED_TNT || entity == EntityType.MINECART_TNT) {
-            if (!perms.has("tnt", perms.has("explode", true))) {
-                event.setCancelled(true);
-                event.getEntity().remove();
-            }
-        }
-        if (entity == EntityType.FIREBALL) {
-            if (!perms.has("fireball", perms.has("explode", true))) {
-                event.setCancelled(true);
-                event.getEntity().remove();
-            }
-        }
-        if (entity == EntityType.SMALL_FIREBALL) {
-            if (!perms.has("fireball", perms.has("explode", true))) {
-                event.setCancelled(true);
-                event.getEntity().remove();
-            }
-        }
-        if (entity == EntityType.WITHER_SKULL) {
-            if (!perms.has("witherdamage", perms.has("damage", true))) {
-                event.setCancelled(true);
-                event.getEntity().remove();
-            }
-        }
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onExplosionPrime(ExplosionPrimeEvent event) {
+		EntityType entity = event.getEntityType();
+		FlagPermissions perms = Residence.getPermsByLoc(event.getEntity()
+				.getLocation());
+		if (entity == EntityType.CREEPER) {
+			if (!perms.has("creeper", perms.has("explode", true))) {
+				event.setCancelled(true);
+				event.getEntity().remove();
+			}
+		}
+		if (entity == EntityType.PRIMED_TNT
+				|| entity == EntityType.MINECART_TNT) {
+			if (!perms.has("tnt", perms.has("explode", true))) {
+				event.setCancelled(true);
+				event.getEntity().remove();
+			}
+		}
+		if (entity == EntityType.FIREBALL) {
+			if (!perms.has("fireball", perms.has("explode", true))) {
+				event.setCancelled(true);
+				event.getEntity().remove();
+			}
+		}
+		if (entity == EntityType.SMALL_FIREBALL) {
+			if (!perms.has("fireball", perms.has("explode", true))) {
+				event.setCancelled(true);
+				event.getEntity().remove();
+			}
+		}
+		if (entity == EntityType.WITHER_SKULL) {
+			if (!perms.has("witherdamage", perms.has("damage", true))) {
+				event.setCancelled(true);
+				event.getEntity().remove();
+			}
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onEntityExplode(EntityExplodeEvent event) {
-        if (event.isCancelled() || event.getEntity() == null)
-            return;
-        Boolean cancel = false;
-        EntityType entity = event.getEntityType();
-        FlagPermissions perms = Residence.getPermsByLoc(event.getEntity().getLocation());
-        FlagPermissions world = Residence.getWorldFlags().getPerms(event.getEntity().getWorld().getName());
-        if (entity == EntityType.CREEPER) {
-            if (!perms.has("creeper", perms.has("explode", true))) {
-                cancel = true;
-            }
-        }
-        if (entity == EntityType.PRIMED_TNT || entity == EntityType.MINECART_TNT) {
-            if (!perms.has("tnt", perms.has("explode", true))) {
-                cancel = true;
-            }
-        }
-        if (entity == EntityType.FIREBALL) {
-            if (!perms.has("fireball", perms.has("explode", true))) {
-                cancel = true;
-            }
-        }
-        if (entity == EntityType.SMALL_FIREBALL) {
-            if (!perms.has("fireball", perms.has("explode", true))) {
-                cancel = true;
-            }
-        }
-        if (entity == EntityType.WITHER_SKULL || entity == EntityType.WITHER) {
-            if (!perms.has("wither", perms.has("explode", world.has("wither", world.has("explode", true))))) {
-                cancel = true;
-            }
-        }
-        if (cancel) {
-            event.setCancelled(true);
-            event.getEntity().remove();
-        } else {
-            List<Block> preserve = new ArrayList<Block>();
-            for (Block block : event.blockList()) {
-                FlagPermissions blockperms = Residence.getPermsByLoc(block.getLocation());
-                if ((!blockperms.has("wither", blockperms.has("explode", world.has("wither", world.has("explode", true)))) && (entity == EntityType.WITHER || entity == EntityType.WITHER_SKULL) || (!blockperms.has("fireball", blockperms.has("explode", true)) && (entity == EntityType.FIREBALL || entity == EntityType.SMALL_FIREBALL)) || (!blockperms.has("tnt", blockperms.has("explode", true)) && (entity == EntityType.PRIMED_TNT || entity == EntityType.MINECART_TNT)) || (!blockperms.has("creeper", blockperms.has("explode", true)) && entity == EntityType.CREEPER))) {
-                    if (block != null) {
-                        preserve.add(block);
-                    }
-                }
-            }
-            for (Block block : preserve) {
-                event.blockList().remove(block);
-            }
-        }
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onEntityExplode(EntityExplodeEvent event) {
+		if (event.isCancelled() || event.getEntity() == null)
+			return;
+		Boolean cancel = false;
+		EntityType entity = event.getEntityType();
+		FlagPermissions perms = Residence.getPermsByLoc(event.getEntity()
+				.getLocation());
+		FlagPermissions world = Residence.getWorldFlags().getPerms(
+				event.getEntity().getWorld().getName());
+		if (entity == EntityType.CREEPER) {
+			if (!perms.has("creeper", perms.has("explode", true))) {
+				cancel = true;
+			}
+		}
+		if (entity == EntityType.PRIMED_TNT
+				|| entity == EntityType.MINECART_TNT) {
+			if (!perms.has("tnt", perms.has("explode", true))) {
+				cancel = true;
+			}
+		}
+		if (entity == EntityType.FIREBALL) {
+			if (!perms.has("fireball", perms.has("explode", true))) {
+				cancel = true;
+			}
+		}
+		if (entity == EntityType.SMALL_FIREBALL) {
+			if (!perms.has("fireball", perms.has("explode", true))) {
+				cancel = true;
+			}
+		}
+		if (entity == EntityType.WITHER_SKULL || entity == EntityType.WITHER) {
+			if (!perms.has(
+					"wither",
+					perms.has("explode",
+							world.has("wither", world.has("explode", true))))) {
+				cancel = true;
+			}
+		}
+		if (cancel) {
+			event.setCancelled(true);
+			event.getEntity().remove();
+		} else {
+			List<Block> preserve = new ArrayList<Block>();
+			for (Block block : event.blockList()) {
+				FlagPermissions blockperms = Residence.getPermsByLoc(block
+						.getLocation());
+				if ((!blockperms.has("wither", blockperms.has("explode",
+						world.has("wither", world.has("explode", true))))
+						&& (entity == EntityType.WITHER || entity == EntityType.WITHER_SKULL)
+						|| (!blockperms.has("fireball",
+								blockperms.has("explode", true)) && (entity == EntityType.FIREBALL || entity == EntityType.SMALL_FIREBALL))
+						|| (!blockperms.has("tnt",
+								blockperms.has("explode", true)) && (entity == EntityType.PRIMED_TNT || entity == EntityType.MINECART_TNT)) || (!blockperms
+						.has("creeper", blockperms.has("explode", true)) && entity == EntityType.CREEPER))) {
+					if (block != null) {
+						preserve.add(block);
+					}
+				}
+			}
+			for (Block block : preserve) {
+				event.blockList().remove(block);
+			}
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onSplashPotion(PotionSplashEvent event) {
-    	if(event.isCancelled())
-    		return;
-    	Entity ent = event.getEntity();
-    	boolean srcpvp = Residence.getPermsByLoc(ent.getLocation()).has("pvp", true);
-    	Iterator<LivingEntity> it = event.getAffectedEntities().iterator();
-    	while(it.hasNext()){
-    		LivingEntity target = it.next();
-    		if(target.getType()==EntityType.PLAYER){
-    			Boolean tgtpvp = Residence.getPermsByLoc(target.getLocation()).has("pvp", true);
-    			if(!srcpvp || !tgtpvp){
-    				event.setIntensity(target, 0);
-    			}
-    		}
-    	}
-    }
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onSplashPotion(PotionSplashEvent event) {
+		if (event.isCancelled())
+			return;
+		Entity ent = event.getEntity();
+		boolean srcpvp = Residence.getPermsByLoc(ent.getLocation()).has("pvp",
+				true);
+		Iterator<LivingEntity> it = event.getAffectedEntities().iterator();
+		while (it.hasNext()) {
+			LivingEntity target = it.next();
+			if (target.getType() == EntityType.PLAYER) {
+				Boolean tgtpvp = Residence.getPermsByLoc(target.getLocation())
+						.has("pvp", true);
+				if (!srcpvp || !tgtpvp) {
+					event.setIntensity(target, 0);
+				}
+			}
+		}
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
-    	if (event.getEntityType() == EntityType.ITEM_FRAME || event.getEntityType() == EntityType.ARMOR_STAND) {
-    		Entity dmgr = event.getDamager();
-    		Player player;
-    		if (event.getDamager() instanceof Player) {
-    			player = (Player) event.getDamager();
-    		} else {		
-    			if (dmgr instanceof Projectile && ((Projectile) dmgr).getShooter() instanceof Player) {
-    				player = (Player) ((Projectile) dmgr).getShooter();
-    			} else
-    				return;
-    		}
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
+		if (event.getEntityType() == EntityType.ITEM_FRAME
+				|| event.getEntityType() == EntityType.ARMOR_STAND) {
+			Entity dmgr = event.getDamager();
+			Player player;
+			if (dmgr instanceof Player) {
+				player = (Player) event.getDamager();
+			} else {
+				if (dmgr instanceof Projectile
+						&& ((Projectile) dmgr).getShooter() instanceof Player) {
+					player = (Player) ((Projectile) dmgr).getShooter();
+				} else
+					return;
+			}
 
-    		if (Residence.isResAdminOn(player))
-    			return;
+			if (Residence.isResAdminOn(player))
+				return;
 
-    		// Note: Location of entity, not player; otherwise player could stand outside of res and still damage
-    		Location loc = event.getEntity().getLocation();
-    		ClaimedResidence res = Residence.getResidenceManager().getByLoc(loc);
-    		if (res != null && !res.getPermissions().playerHas(player.getName(), "container", false)) {
-    			event.setCancelled(true);
-                player.sendMessage(ChatColor.RED + Residence.getLanguage().getPhrase("FlagDeny", "container"));
-    		}
-    	}
-    }
+			// Note: Location of entity, not player; otherwise player could
+			// stand outside of res and still damage
+			Location loc = event.getEntity().getLocation();
+			ClaimedResidence res = Residence.getResidenceManager()
+					.getByLoc(loc);
+			if (res != null) {
+				if (!res.getPermissions().has("container", false)) {
+					if (isMonster(dmgr)) {
+						event.setCancelled(true);
+						return;
+					}
+				}
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onEntityDamage(EntityDamageEvent event) {
-        Entity ent = event.getEntity();
-        if(ent.hasMetadata("NPC")) {
-            return;
-        }
-        boolean tamedWolf = ent instanceof Wolf ? ((Wolf)ent).isTamed() : false;
-        ClaimedResidence area = Residence.getResidenceManager().getByLoc(ent.getLocation());
-        /* Living Entities */
-        if (event instanceof EntityDamageByEntityEvent) {
-            EntityDamageByEntityEvent attackevent = (EntityDamageByEntityEvent) event;
-            Entity damager = attackevent.getDamager();
-            ClaimedResidence srcarea = null;
-            if (damager != null) {
-                srcarea = Residence.getResidenceManager().getByLoc(damager.getLocation());
-            }
-            boolean srcpvp = true;
-            if (srcarea != null) {
-                srcpvp = srcarea.getPermissions().has("pvp", true);
-            }
-            ent = attackevent.getEntity();
-            if ((ent instanceof Player || tamedWolf) && (damager instanceof Player || (damager instanceof Arrow && (((Arrow)damager).getShooter() instanceof Player)))) {
-                Player attacker = null;
-                if (damager instanceof Player) {
-                    attacker = (Player) damager;
-                } else if (damager instanceof Arrow) {
-                    attacker = (Player)((Arrow)damager).getShooter();
-                }
-                if(!srcpvp) {
-                    attacker.sendMessage(ChatColor.RED+Residence.getLanguage().getPhrase("NoPVPZone"));
-                    event.setCancelled(true);
-                    return;
-                }
-                /* Check for Player vs Player */
-                if (area == null) {
-                    /* World PvP */
-                    if (!Residence.getWorldFlags().getPerms(damager.getWorld().getName()).has("pvp", true)) {
-                        attacker.sendMessage(ChatColor.RED+Residence.getLanguage().getPhrase("WorldPVPDisabled"));
-                        event.setCancelled(true);
-                    }
-                } else {
-                    /* Normal PvP */
-                    if (!area.getPermissions().has("pvp", true)) {
-                        attacker.sendMessage(ChatColor.RED+Residence.getLanguage().getPhrase("NoPVPZone"));
-                        event.setCancelled(true);
-                    }
-                }
-                return;
-            } else if ((ent instanceof Player || tamedWolf) && (damager instanceof Creeper)) {
-                if (area == null) {
-                    if (!Residence.getWorldFlags().getPerms(damager.getWorld().getName()).has("creeper", true)) {
-                        event.setCancelled(true);
-                    }
-                } else {
-                    if (!area.getPermissions().has("creeper", true)) {
-                        event.setCancelled(true);
-                    }
-                }
-            }
-        }
-        if (area == null) {
-            if (!Residence.getWorldFlags().getPerms(ent.getWorld().getName()).has("damage", true) && (ent instanceof Player || tamedWolf)) {
-                event.setCancelled(true);
-            }
-        } else {
-            if (!area.getPermissions().has("damage", true) && (ent instanceof Player || tamedWolf)) {
-                event.setCancelled(true);
-            }
-        }
-        if (event.isCancelled()) {
-            /* Put out a fire on a player */
-            if ((ent instanceof Player || tamedWolf)
-                    && (event.getCause() == EntityDamageEvent.DamageCause.FIRE
-                    || event.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK)) {
-                ent.setFireTicks(0);
-            }
-        }
-    }
+				if (!res.getPermissions().playerHas(player.getName(),
+						"container", false)) {
+					event.setCancelled(true);
+					player.sendMessage(ChatColor.RED
+							+ Residence.getLanguage().getPhrase("FlagDeny",
+									"container"));
+				}
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onEntityDamage(EntityDamageEvent event) {
+		Entity ent = event.getEntity();
+		if (ent.hasMetadata("NPC")) {
+			return;
+		}
+		boolean tamedWolf = ent instanceof Wolf ? ((Wolf) ent).isTamed()
+				: false;
+		ClaimedResidence area = Residence.getResidenceManager().getByLoc(
+				ent.getLocation());
+		/* Living Entities */
+		if (event instanceof EntityDamageByEntityEvent) {
+			EntityDamageByEntityEvent attackevent = (EntityDamageByEntityEvent) event;
+			Entity damager = attackevent.getDamager();
+			ClaimedResidence srcarea = null;
+			if (damager != null) {
+				srcarea = Residence.getResidenceManager().getByLoc(
+						damager.getLocation());
+			}
+			boolean srcpvp = true;
+			if (srcarea != null) {
+				srcpvp = srcarea.getPermissions().has("pvp", true);
+			}
+			ent = attackevent.getEntity();
+			if ((ent instanceof Player || tamedWolf)
+					&& (damager instanceof Player || (damager instanceof Arrow && (((Arrow) damager)
+							.getShooter() instanceof Player)))) {
+				Player attacker = null;
+				if (damager instanceof Player) {
+					attacker = (Player) damager;
+				} else if (damager instanceof Arrow) {
+					attacker = (Player) ((Arrow) damager).getShooter();
+				}
+				if (!srcpvp) {
+					attacker.sendMessage(ChatColor.RED
+							+ Residence.getLanguage().getPhrase("NoPVPZone"));
+					event.setCancelled(true);
+					return;
+				}
+				/* Check for Player vs Player */
+				if (area == null) {
+					/* World PvP */
+					if (!Residence.getWorldFlags()
+							.getPerms(damager.getWorld().getName())
+							.has("pvp", true)) {
+						attacker.sendMessage(ChatColor.RED
+								+ Residence.getLanguage().getPhrase(
+										"WorldPVPDisabled"));
+						event.setCancelled(true);
+					}
+				} else {
+					/* Normal PvP */
+					if (!area.getPermissions().has("pvp", true)) {
+						attacker.sendMessage(ChatColor.RED
+								+ Residence.getLanguage()
+										.getPhrase("NoPVPZone"));
+						event.setCancelled(true);
+					}
+				}
+				return;
+			} else if ((ent instanceof Player || tamedWolf)
+					&& (damager instanceof Creeper)) {
+				if (area == null) {
+					if (!Residence.getWorldFlags()
+							.getPerms(damager.getWorld().getName())
+							.has("creeper", true)) {
+						event.setCancelled(true);
+					}
+				} else {
+					if (!area.getPermissions().has("creeper", true)) {
+						event.setCancelled(true);
+					}
+				}
+			}
+		}
+		if (area == null) {
+			if (!Residence.getWorldFlags().getPerms(ent.getWorld().getName())
+					.has("damage", true)
+					&& (ent instanceof Player || tamedWolf)) {
+				event.setCancelled(true);
+			}
+		} else {
+			if (!area.getPermissions().has("damage", true)
+					&& (ent instanceof Player || tamedWolf)) {
+				event.setCancelled(true);
+			}
+		}
+		if (event.isCancelled()) {
+			/* Put out a fire on a player */
+			if ((ent instanceof Player || tamedWolf)
+					&& (event.getCause() == EntityDamageEvent.DamageCause.FIRE || event
+							.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK)) {
+				ent.setFireTicks(0);
+			}
+		}
+	}
 }