prevent being unable to use commands when hitting a safe mob

src/main/java/com/faceyspacies/NoEscape/NoEscape.java

@@ -18,19 +18,28 @@
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class NoEscape extends JavaPlugin {
 
 	protected static List<Player> NoEscapePlayers = new LinkedList<Player>();
+	protected static List<EntityType> safeMobs = new LinkedList<EntityType>();
 
 	@Override
 	public void onEnable() {
 		this.saveDefaultConfig(); // shouldn't override actual config if it exist
 
 		getCommand("noescape").setExecutor(this);
 		getServer().getPluginManager().registerEvents(new NoEscapeListener(this), this);
+
+		List<String> safeMobsFromConfig = this.getConfig().getStringList("safe-mobs");
+		for(String element: safeMobsFromConfig) {
+			element = element.toUpperCase().replace(" ", "_");
+			if(EntityType.valueOf(element) != null )
+				safeMobs.add(EntityType.valueOf(element));
+		}		
 	}
 
 	@Override

src/main/java/com/faceyspacies/NoEscape/NoEscapeListener.java

@@ -64,26 +64,32 @@ public void dmg(EntityDamageEvent event) {
 		if(event.getCause() == EntityDamageEvent.DamageCause.ENTITY_ATTACK ||
 				event.getCause() == EntityDamageEvent.DamageCause.ENTITY_EXPLOSION ||
 				event.getCause() == EntityDamageEvent.DamageCause.PROJECTILE) {
-
-			if( hitPlayer || causedByPlayer ) { 
+
+			if(!hitPlayer) {
+				if(NoEscape.safeMobs.contains(event.getEntity().getType())) {
+					return; // player hit a safe to hit mob
+				}
+			}
+
+			if( !hitPlayer && causedByPlayer ) { 
 				if(this.plugin.getConfig().getBoolean("PvM")) {
-					if( hitPlayer && !causedByPlayer ) {
-						if(!((Player)damagee).hasPermission("noescape.bypass"))
-							createTask((Player)damagee); // player is hit by entity
-					}
-					else if ( !hitPlayer && causedByPlayer ) {
-						if(this.plugin.getConfig().getBoolean("PvM")) {
-							if(!((Player)(((EntityDamageByEntityEvent) event).getDamager())).hasPermission("noescape.bypass"))
-								createTask((Player)(((EntityDamageByEntityEvent) event).getDamager()));
-							// player is hitting something not human
-						}
-					}
+					if(!((Player)(((EntityDamageByEntityEvent) event).getDamager())).hasPermission("noescape.bypass"))
+						createTask((Player)(((EntityDamageByEntityEvent) event).getDamager())); // player hit entity
 				}
-
-				if(this.plugin.getConfig().getBoolean("PvP")) {
+			}
+
+			else if( hitPlayer && !causedByPlayer ) {
+				if(this.plugin.getConfig().getBoolean("PvM")) {
 					if(!((Player)damagee).hasPermission("noescape.bypass"))
 						createTask((Player)damagee);
+				}
+			}
 
+			if(this.plugin.getConfig().getBoolean("PvP")) {
+				if( hitPlayer && causedByPlayer ) {
+					if(!((Player)damagee).hasPermission("noescape.bypass"))
+						createTask((Player)damagee);
+
 					if(!((Player)(((EntityDamageByEntityEvent) event).getDamager())).hasPermission("noescape.bypass"))
 						createTask((Player)(((EntityDamageByEntityEvent) event).getDamager()));
 				}

src/main/resources/config.yml

@@ -13,3 +13,14 @@ disabled-in-worlds:
  - world_example
 #Message that is sent to the players when they try to use commands after receiving damage. Supports & color codes.
 message: '&cYou can not use commands when taking damage!'
+# Mobs when attacked by the player that will not restrict use of command
+safe-mobs:
+ - cow
+ - sheep
+ - chicken
+ - horse
+ - pig
+ - mushroom cow
+ - squid
+ - snowman
+ - villager

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: NoEscape
 main: com.faceyspacies.NoEscape.NoEscape
-version: 1.0
+version: 1.1
 author: tehTyA
 
 commands: