summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
index f46264582..97bcb9c8e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
@@ -56,11 +56,6 @@ public class Commandspawnmob extends EssentialsCommand
}
}
- if (ess.getSettings().getProtectPreventSpawn(mobType.toLowerCase())
- || (mountType != null && ess.getSettings().getProtectPreventSpawn(mountType.toLowerCase())))
- {
- throw new Exception(Util.i18n("unableToSpawnMob"));
- }
Entity spawnedMob = null;
Mob mob = null;
@@ -72,6 +67,12 @@ public class Commandspawnmob extends EssentialsCommand
{
throw new Exception(Util.i18n("invalidMob"));
}
+
+ if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase()))
+ {
+ throw new Exception(Util.i18n("unableToSpawnMob"));
+ }
+
int[] ignore =
{
8, 9
@@ -102,6 +103,11 @@ public class Commandspawnmob extends EssentialsCommand
user.sendMessage(Util.i18n("invalidMob"));
return;
}
+
+ if (ess.getSettings().getProtectPreventSpawn(mobMount.getType().toString().toLowerCase()))
+ {
+ throw new Exception(Util.i18n("unableToSpawnMob"));
+ }
try
{
spawnedMount = mobMount.spawn(user, server, loc);