diff --git a/game/src/main/org/apollo/game/message/handler/NpcActionVerificationHandler.java b/game/src/main/org/apollo/game/message/handler/NpcActionVerificationHandler.java index 0528aa01..32f5cefc 100644 --- a/game/src/main/org/apollo/game/message/handler/NpcActionVerificationHandler.java +++ b/game/src/main/org/apollo/game/message/handler/NpcActionVerificationHandler.java @@ -43,7 +43,15 @@ public final class NpcActionVerificationHandler extends MessageHandler= 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; }