Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

New collection utilized

Browse Source
This commit is contained in:
MagicBot
2023-10-19 16:44:29 -04:00
parent cf7e19bfde
commit 1daa45d604
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Building.java
+2 -3
View File
@@ -63,7 +63,6 @@ public class Building extends AbstractWorldObject {
public float statAlt; public float statAlt;
public LocalDateTime upgradeDateTime = null; public LocalDateTime upgradeDateTime = null;
public LocalDateTime taxDateTime = null; public LocalDateTime taxDateTime = null;
public ArrayList<Vector3fImmutable> patrolPoints = new ArrayList<>();
public ArrayList<Vector3fImmutable> sentryPoints = new ArrayList<>(); public ArrayList<Vector3fImmutable> sentryPoints = new ArrayList<>();
public TaxType taxType = TaxType.NONE; public TaxType taxType = TaxType.NONE;
public int taxAmount; public int taxAmount;
@@ -96,6 +95,7 @@ public class Building extends AbstractWorldObject {
private ConcurrentHashMap<String, Long> timestamps = null; private ConcurrentHashMap<String, Long> timestamps = null;
private ConcurrentHashMap<Integer, BuildingFriends> friends; private ConcurrentHashMap<Integer, BuildingFriends> friends;
private ConcurrentHashMap<Integer, Condemned> condemned; private ConcurrentHashMap<Integer, Condemned> condemned;
public ArrayList<Vector3fImmutable> patrolPoints;
public ProtectionState protectionState = ProtectionState.NONE; public ProtectionState protectionState = ProtectionState.NONE;
private ArrayList<Building> children = null; private ArrayList<Building> children = null;
@@ -926,8 +926,7 @@ public class Building extends AbstractWorldObject {
if (this.blueprintUUID == 0) if (this.blueprintUUID == 0)
this.setHealth(healthMax); this.setHealth(healthMax);
if (blueprint.getBuildingGroup().equals(BuildingGroup.BARRACK)) this.patrolPoints = BuildingManager._buildingPatrolPoints.computeIfAbsent(this.getObjectUUID(), k -> new ArrayList<>());
this.patrolPoints = DbManager.BuildingQueries.LOAD_PATROL_POINTS(this);
} else { } else {
this.healthMax = 100000; // Structures with no blueprint mesh this.healthMax = 100000; // Structures with no blueprint mesh