slot NPC fix

2024-03-05 20:32:09 -06:00
parent 35e18e4186
commit cd900d6e2e
3 changed files with 6 additions and 38 deletions
@@ -520,40 +520,10 @@ public enum BuildingManager {
        if (building.getBlueprintUUID() == 0)
            return false;

-        if (building.getBlueprint().getMaxSlots() == building.getHirelings().size() && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.TOL) == false)
-            return false;
-
-        int availableSlots = 0;
-        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.TOL)){
-        switch (building.getRank()) {
-
-            case 1:
-            case 2:
-                availableSlots = 1;
-                break;
-            case 3:
-            case 4:
-            case 5:
-                availableSlots = 2;
-                break;
-            case 6:
-            case 7:
-                availableSlots = 3;
-                break;
-            case 8:
-                availableSlots = 3;
-                break;
-            default:
-                availableSlots = 0;
-                break;
-        }
-
-            availableSlots += 1;
-        }
-        if (availableSlots == 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)