diff --git a/src/engine/net/client/msg/VendorDialogMsg.java b/src/engine/net/client/msg/VendorDialogMsg.java index 801d3cc0..a67b29b8 100644 --- a/src/engine/net/client/msg/VendorDialogMsg.java +++ b/src/engine/net/client/msg/VendorDialogMsg.java @@ -120,18 +120,22 @@ public class VendorDialogMsg extends ClientNetMsg { VendorDialog vd = null; Contract contract = npc.getContract(); - if (contract == null) - vd = VendorDialog.getHostileVendorDialog(); - else if (npc.getBuilding() != null) { - if (BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter)) + if(contract.getContractID() == 1502042){ + vd = Contract.HandleBaneCommanderOptions(msg.unknown03); + }else { + + if (contract == null) vd = VendorDialog.getHostileVendorDialog(); - else + else if (npc.getBuilding() != null) { + if (BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter)) + vd = VendorDialog.getHostileVendorDialog(); + else + vd = contract.getVendorDialog(); + } else vd = contract.getVendorDialog(); - } else - vd = contract.getVendorDialog(); - if (vd == null) - vd = VendorDialog.getHostileVendorDialog(); - + if (vd == null) + vd = VendorDialog.getHostileVendorDialog(); + } if (msg.messageType == 1 || msg.unknown03 == vd.getObjectUUID()) { msg.updateMessage(3, vd); } else { diff --git a/src/engine/objects/Contract.java b/src/engine/objects/Contract.java index 585043b4..2f5b8823 100644 --- a/src/engine/objects/Contract.java +++ b/src/engine/objects/Contract.java @@ -187,17 +187,21 @@ public class Contract extends AbstractGameObject { } public VendorDialog getVendorDialog() { - if(this.contractID == 1502042) { + return this.vendorDialog; + } + + public static VendorDialog HandleBaneCommanderOptions(int optionId){ + if(optionId == 0) { VendorDialog vd = VendorDialog.getHostileVendorDialog(); vd.getOptions().clear(); - MenuOption option1 = new MenuOption(796,"Set Bane Day",796); + MenuOption option1 = new MenuOption(796, "Set Bane Day", 796); vd.getOptions().add(option1); + MenuOption option2 = new MenuOption(797, "Set Bane Time", 797); + vd.getOptions().add(option2); return vd; } - - - return this.vendorDialog; + return VendorDialog.getHostileVendorDialog(); } public ArrayList getNPCMenuOptions() {