|
|
@ -100,6 +100,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { |
|
|
|
|
|
|
|
|
|
|
|
if (contractItem == null) |
|
|
|
if (contractItem == null) |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
|
|
|
|
|
|
|
|
if (msg.getContractItem() == 850) {//runemaster
|
|
|
|
if (msg.getContractItem() == 850) {//runemaster
|
|
|
|
for (AbstractCharacter abs : building.getHirelings().keySet()) { |
|
|
|
for (AbstractCharacter abs : building.getHirelings().keySet()) { |
|
|
|
NPC npc = (NPC) abs; |
|
|
|
NPC npc = (NPC) abs; |
|
|
@ -143,8 +144,16 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { |
|
|
|
if (contract.getContractID() == 865)//siege engineer
|
|
|
|
if (contract.getContractID() == 865)//siege engineer
|
|
|
|
override = true; |
|
|
|
override = true; |
|
|
|
} |
|
|
|
} |
|
|
|
if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SIEGETENT)){ |
|
|
|
if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHACK)){ |
|
|
|
if(contract.getContractID() == 865)//siege engineer
|
|
|
|
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; |
|
|
|
override = true; |
|
|
|
} |
|
|
|
} |
|
|
|
if(override == false) { |
|
|
|
if(override == false) { |
|
|
|