Merge pull request #130 from ryleykimmel/issue74

Fixes issue #74
2026-07-03 00:38:21 +00:00 · 2016-01-25 21:00:49 +00:00
parent fa0fb763d3 088d872f93
commit 05a7838380
1 changed files with 9 additions and 1 deletions
@@ -43,7 +43,15 @@ public final class NpcActionVerificationHandler extends MessageHandler<NpcAction
 		}

 		NpcDefinition definition = npc.getDefinition();
-		if (message.getOption() >= definition.getInteractions().length) {
+		String[] actions = definition.getInteractions();
+		int option = message.getOption();
+
+		if (option < 0 || option >= actions.length) {
+			message.terminate();
+			return;
+		}
+
+		if ("null".equals(actions[option])) {
 			message.terminate();
 			return;
 		}