Catch NPE with /denizen listener command when player has no active li…

…steners.
DenizenScript · Apr 9, 2013 · d5356ff · d5356ff
1 parent 58fbf67
commit d5356ff
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/CommandHandler.java b/src/main/java/net/aufdemrand/denizen/CommandHandler.java
@@ -730,6 +730,13 @@ public void listener(CommandContext args, CommandSender sender, NPC npc) throws
 
         if (player == null) throw new CommandException("Specified player not online or not found!");
 
+        Map<String,AbstractListener> listeners = denizen.getListenerRegistry().getListenersFor(player);
+
+        if (listeners == null || listeners.isEmpty()) {
+            Messaging.send(sender, ChatColor.GREEN + player.getName() + " has no active listeners.");
+            return;
+        }
+
         if (args.hasValueFlag("report")) {
             for (AbstractListener quest : denizen.getListenerRegistry().getListenersFor(player).values())
                 if (quest.getListenerId().equalsIgnoreCase(args.getFlag("report")))
@@ -765,8 +772,6 @@ public void listener(CommandContext args, CommandSender sender, NPC npc) throws
         paginator.header("Active quest listeners for " + player.getName() + ":");
         paginator.addLine("<e>Key: <a>Type  <b>ID");
 
-        Map<String,AbstractListener> listeners = denizen.getListenerRegistry().getListenersFor(player);
-
         if (listeners == null || listeners.isEmpty())
             paginator.addLine("None.");
         else for (AbstractListener quest : listeners.values())