From e66e430d30ccf97335e90859447096153cb3e468 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sun, 29 Dec 2024 16:19:08 -0600 Subject: [PATCH] fixed NPC interaction --- src/engine/net/client/msg/VendorDialogMsg.java | 2 +- src/engine/objects/Contract.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/engine/net/client/msg/VendorDialogMsg.java b/src/engine/net/client/msg/VendorDialogMsg.java index f5f37af8..3682996e 100644 --- a/src/engine/net/client/msg/VendorDialogMsg.java +++ b/src/engine/net/client/msg/VendorDialogMsg.java @@ -142,7 +142,7 @@ public class VendorDialogMsg extends ClientNetMsg { if (VendorDialogMsg.handleSpecialCase(msg, npc, playerCharacter, vd, origin)) return; } - vd = VendorDialog.getVendorDialog(msg.unknown03); + //vd = VendorDialog.getVendorDialog(msg.unknown03); msg.updateMessage(3, vd); } diff --git a/src/engine/objects/Contract.java b/src/engine/objects/Contract.java index c1b063d7..cf249773 100644 --- a/src/engine/objects/Contract.java +++ b/src/engine/objects/Contract.java @@ -195,6 +195,7 @@ public class Contract extends AbstractGameObject { } public static VendorDialog HandleBaneCommanderOptions(int optionId, NPC npc, PlayerCharacter pc){ + pc.setLastNPCDialog(null); VendorDialog vd = VendorDialog.getHostileVendorDialog(); vd.getOptions().clear(); Building building = npc.building;