From 2e5892ff32e48aab433f8a24a3d1774bd693ccd9 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 5 Mar 2024 20:10:04 -0600 Subject: [PATCH] slot NPC fix --- .../net/client/handlers/ActivateNPCMsgHandler.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java index 4e0179d7..a3aff40a 100644 --- a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java +++ b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java @@ -100,6 +100,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { if (contractItem == null) return false; + if (msg.getContractItem() == 850) {//runemaster for (AbstractCharacter abs : building.getHirelings().keySet()) { NPC npc = (NPC) abs; @@ -143,8 +144,16 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { if (contract.getContractID() == 865)//siege engineer override = true; } - if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SIEGETENT)){ - if(contract.getContractID() == 865)//siege engineer + if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHACK)){ + if(contract.getContractID() == 830)//merchant + override = true; + } + if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHRINE)){ + if(contract.getContractID() == 252637)//votary + override = true; + } + if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BULWARK)){ + if(contract.getContractID() == 839)//artillery captain override = true; } if(override == false) {