Override removed edge case handed in db.
This commit is contained in:
@@ -51,13 +51,6 @@ public enum BuildingManager {
|
|||||||
|
|
||||||
for (int i = 1; i <= numOfSlots; i++) {
|
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))
|
if (!building.getHirelings().containsValue(i))
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -246,7 +246,7 @@ public class Contract extends AbstractGameObject {
|
|||||||
if (building == null)
|
if (building == null)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Can't slot in anything but a blueprintted building
|
// Can't slot in anything but a blueprinted building
|
||||||
if (building.getBlueprintUUID() == 0)
|
if (building.getBlueprintUUID() == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -254,13 +254,6 @@ public class Contract extends AbstractGameObject {
|
|||||||
if (this.allowedBuildings.size() == 0)
|
if (this.allowedBuildings.size() == 0)
|
||||||
return false;
|
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
|
// Binary match
|
||||||
return (building.getBlueprint().getBuildingGroup().elementOf(this.allowedBuildings));
|
return (building.getBlueprint().getBuildingGroup().elementOf(this.allowedBuildings));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user