Gracefully handle failure to spawn mobs due to WorldGuard.

NerdNu · Apr 3, 2020 · 512539f · 512539f
1 parent f2755d9
commit 512539f
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/nu/nerd/beastmaster/commands/BeastMobExecutor.java b/src/nu/nerd/beastmaster/commands/BeastMobExecutor.java
@@ -398,11 +398,17 @@ protected boolean onCommandSpawnOrStatue(CommandSender sender, String[] args) {
 
         boolean isStatue = args[0].equals("statue");
         LivingEntity mob = BeastMaster.PLUGIN.spawnMob(spawnLoc, mobType, false);
-        mob.setAI(!isStatue);
-        sender.sendMessage(ChatColor.GOLD + "Spawned " + ChatColor.YELLOW + mobType.getId() +
-                           ChatColor.GOLD + (isStatue ? " statue" : "") + " at " +
-                           ChatColor.YELLOW + Util.formatLocation(spawnLoc) +
-                           ChatColor.GOLD + ".");
+        if (mob != null) {
+            mob.setAI(!isStatue);
+            sender.sendMessage(ChatColor.GOLD + "Spawned " + ChatColor.YELLOW + mobType.getId() +
+                               ChatColor.GOLD + (isStatue ? " statue" : "") + " at " +
+                               ChatColor.YELLOW + Util.formatLocation(spawnLoc) +
+                               ChatColor.GOLD + ".");
+        } else {
+            sender.sendMessage(ChatColor.RED + "Unable to spawn a " + mobType.getId() +
+                               (isStatue ? " statue" : "") + " at " + Util.formatLocation(spawnLoc) + ".");
+            sender.sendMessage(ChatColor.RED + "Is there a WorldGuard region preventing that?");
+        }
         return true;
     } // onCommandSpawnOrStatue