From cb0320a471bf3dd8c482ba3a8fe41b55a13266dd Mon Sep 17 00:00:00 2001 From: yuzumika Date: Wed, 3 Jan 2024 16:10:23 -0800 Subject: [PATCH] NPCMoreTalkHandler: don't underflow selection --- .../java/net/server/channel/handlers/NPCMoreTalkHandler.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java b/src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java index 0dc04cd8a0..fa7c0a09e7 100644 --- a/src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java +++ b/src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java @@ -60,6 +60,11 @@ public final class NPCMoreTalkHandler extends AbstractPacketHandler { selection = p.readInt(); } else if (p.available() > 0) { selection = p.readByte(); + // If there are more than 127 choices, don't underflow to -128. + // This is useful if you want to have more than 127 hairs/faces at a stylist NPC. + if (selection < 0) { + selection += 256; + } } if (c.getQM() != null) { if (c.getQM().isStart()) {