From 3bd7d82ab63c151911c49b2ae9223f786797efc4 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Mon, 2 Sep 2013 13:57:23 -0700 Subject: [PATCH] Prevent NPE on /ex foreach It still nulls the values but at least it doesn't blow up the server --- .../net/aufdemrand/denizen/scripts/commands/BracedCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java index 63899a3c71..48b697fcf3 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java @@ -112,7 +112,7 @@ else if (arg.matches("-") && bracesEntered == 1) { args = command.toArray(args); commands.add(new ScriptEntry(cmd, args, - scriptEntry.getScript().getContainer())); + scriptEntry.getScript() != null?scriptEntry.getScript().getContainer():null)); commands.get(commands.size() - 1).setPlayer(scriptEntry.getPlayer()); commands.get(commands.size() - 1).setNPC(scriptEntry.getNPC()); if (hyperdebug) dB.echoDebug("Command added: " + cmd + ", with " + String.valueOf(args.length) + " arguments");