Browse Source

new NPC for ToL support

lakebane-master
FatBoy-DOTC 9 months ago
parent
commit
97c063661a
  1. 5
      src/engine/gameManager/BuildingManager.java
  2. 4
      src/engine/net/client/handlers/ActivateNPCMsgHandler.java

5
src/engine/gameManager/BuildingManager.java

@ -520,9 +520,10 @@ public enum BuildingManager { @@ -520,9 +520,10 @@ public enum BuildingManager {
if (building.getBlueprintUUID() == 0)
return false;
if (building.getBlueprint().getSlotsForRank(building.getRank()) == building.getHirelings().size())
if (building.getBlueprint().getSlotsForRank(building.getRank()) == building.getHirelings().size()) {
Logger.error("failed at addHireling with contract: " + contract.getContractID());
return false;
}
String pirateName = NPCManager.getPirateName(contract.getMobbaseID());
if (item.getChargesRemaining() > 0)

4
src/engine/net/client/handlers/ActivateNPCMsgHandler.java

@ -147,9 +147,11 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { @@ -147,9 +147,11 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
if(contract.getContractID() == 865)//siege engineer
override = true;
}
if(override == false)
if(override == false) {
Logger.error("failed at override with contract: " + contract.getContractID());
return false;
}
}
if (!BuildingManager.addHireling(building, player, zone, contract, contractItem))
return false;

Loading…
Cancel
Save