Override removed edge case handed in db.

This commit is contained in:
2023-05-03 16:17:53 -04:00
parent 21c6695a05
commit 294f8fe02b
2 changed files with 1 additions and 15 deletions
@@ -51,13 +51,6 @@ public enum BuildingManager {
for (int i = 1; i <= numOfSlots; i++) {
// Slot one is reserved on Arty towers for the trebuchet
if (i == 1 &&
building.getBlueprint() != null &&
building.getBlueprint().getBuildingGroup().equals(BuildingGroup.ARTYTOWER))
continue;
if (!building.getHirelings().containsValue(i))
return i;
}
+1 -8
View File
@@ -246,7 +246,7 @@ public class Contract extends AbstractGameObject {
if (building == null)
return false;
// Can't slot in anything but a blueprintted building
// Can't slot in anything but a blueprinted building
if (building.getBlueprintUUID() == 0)
return false;
@@ -254,13 +254,6 @@ public class Contract extends AbstractGameObject {
if (this.allowedBuildings.size() == 0)
return false;
// Restrict arty towers to a single captain
if (this.getContractID() == 842) // Tower Arty Captain
for (AbstractCharacter hireling : building.getHirelings().keySet())
if (hireling.contract.getContractID() == 842)
return false;
// Binary match
return (building.getBlueprint().getBuildingGroup().elementOf(this.allowedBuildings));
}