|
|
@ -57,6 +57,21 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { |
|
|
|
|
|
|
|
|
|
|
|
if (contract.canSlotinBuilding(building)) |
|
|
|
if (contract.canSlotinBuilding(building)) |
|
|
|
ItemLists.add(hirelings); |
|
|
|
ItemLists.add(hirelings); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.TOL)){ |
|
|
|
|
|
|
|
if(contract.getContractID() == 899)//alchemist
|
|
|
|
|
|
|
|
ItemLists.add(hirelings); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(contract.getContractID() == 866)//banker
|
|
|
|
|
|
|
|
ItemLists.add(hirelings); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(contract.getContractID() == 865)//siege engineer
|
|
|
|
|
|
|
|
ItemLists.add(hirelings); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SIEGETENT)){ |
|
|
|
|
|
|
|
if(contract.getContractID() == 865)//siege engineer
|
|
|
|
|
|
|
|
ItemLists.add(hirelings); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -85,6 +100,13 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { |
|
|
|
|
|
|
|
|
|
|
|
if (contractItem == null) |
|
|
|
if (contractItem == null) |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
|
|
|
|
if(msg.getContractItem() == 850){//runemaster
|
|
|
|
|
|
|
|
for(AbstractCharacter abs : building.getHirelings().keySet()) { |
|
|
|
|
|
|
|
NPC npc = (NPC)abs; |
|
|
|
|
|
|
|
if(npc.contract.getContractID() == 850) |
|
|
|
|
|
|
|
return false; //can only have 1 runemaster
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!player.getCharItemManager().doesCharOwnThisItem(contractItem.getObjectUUID())) { |
|
|
|
if (!player.getCharItemManager().doesCharOwnThisItem(contractItem.getObjectUUID())) { |
|
|
|
Logger.error(player.getName() + "has attempted to place Hireling : " + contractItem.getName() + "without a valid contract!"); |
|
|
|
Logger.error(player.getName() + "has attempted to place Hireling : " + contractItem.getName() + "without a valid contract!"); |
|
|
|