MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Collection used and old handler removed.

Browse Source
This commit is contained in:
MagicBot
2023-10-18 12:38:04 -04:00
parent 6fb1e2e5f1
commit 5ac62d60be
2 changed files with 18 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/db/handlers/dbBuildingHandler.java
-30
View File
@@ -458,36 +458,6 @@ public class dbBuildingHandler extends dbHandlerBase {
} }
public void LOAD_ALL_FRIENDS_FOR_BUILDING(Building building) {
if (building == null)
return;
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends` WHERE `buildingUID` = ?")) {
preparedStatement.setInt(1, building.getObjectUUID());
ResultSet rs = preparedStatement.executeQuery();
while (rs.next()) {
BuildingFriends friend = new BuildingFriends(rs);
switch (friend.friendType) {
case 7:
building.getFriends().put(friend.playerUID, friend);
break;
case 8:
case 9:
building.getFriends().put(friend.guildUID, friend);
break;
}
}
} catch (SQLException e) {
Logger.error(e);
}
}
public void LOAD_ALL_CONDEMNED_FOR_BUILDING(Building building) { public void LOAD_ALL_CONDEMNED_FOR_BUILDING(Building building) {
if (building == null) if (building == null)
src/engine/objects/Building.java
+18 -17
View File
@@ -94,7 +94,7 @@ public class Building extends AbstractWorldObject {
private boolean spireIsActive = false; private boolean spireIsActive = false;
private ConcurrentHashMap<String, JobContainer> timers = null; private ConcurrentHashMap<String, JobContainer> timers = null;
private ConcurrentHashMap<String, Long> timestamps = null; private ConcurrentHashMap<String, Long> timestamps = null;
private ConcurrentHashMap<Integer, BuildingFriends> friends = new ConcurrentHashMap<>(); private ConcurrentHashMap<Integer, BuildingFriends> friends;
private ConcurrentHashMap<Integer, Condemned> condemned = new ConcurrentHashMap<>(); private ConcurrentHashMap<Integer, Condemned> condemned = new ConcurrentHashMap<>();
public ProtectionState protectionState = ProtectionState.NONE; public ProtectionState protectionState = ProtectionState.NONE;
private ArrayList<Building> children = null; private ArrayList<Building> children = null;
@@ -956,26 +956,27 @@ public class Building extends AbstractWorldObject {
} }
// Submit upgrade job if building is currently set to rank. // Submit upgrade job if building is currently set to rank.
try { try {
DbObjectType objectType = DbManager.BuildingQueries.GET_UID_ENUM(this.ownerUUID); DbObjectType objectType = DbManager.BuildingQueries.GET_UID_ENUM(this.ownerUUID);
this.ownerIsNPC = (objectType == DbObjectType.NPC); this.ownerIsNPC = (objectType == DbObjectType.NPC);
} catch (Exception e) { } catch (Exception e) {
this.ownerIsNPC = false; this.ownerIsNPC = false;
Logger.error("Failed to find Object Type for owner " + this.ownerUUID + " Location " + this.getLoc().toString()); Logger.error("Failed to find Object Type for owner " + this.ownerUUID + " Location " + this.getLoc().toString());
} }
try { this.friends = BuildingManager._buildingFriends.get(this.getObjectUUID());
DbManager.BuildingQueries.LOAD_ALL_FRIENDS_FOR_BUILDING(this);
DbManager.BuildingQueries.LOAD_ALL_CONDEMNED_FOR_BUILDING(this);
} catch (Exception e) {
Logger.error(this.getObjectUUID() + " failed to load friends/condemned." + e.getMessage());
}
//LOad Owners in Cache so we do not have to continuely look in the db for owner. try {
DbManager.BuildingQueries.LOAD_ALL_CONDEMNED_FOR_BUILDING(this);
} catch (Exception e) {
Logger.error(this.getObjectUUID() + " failed to load friends/condemned." + e.getMessage());
}
if (this.ownerIsNPC) { //LOad Owners in Cache so we do not have to continuely look in the db for owner.
if (this.ownerIsNPC) {
if (NPC.getNPC(this.ownerUUID) == null) if (NPC.getNPC(this.ownerUUID) == null)
Logger.info("Building UID " + this.getObjectUUID() + " Failed to Load NPC Owner with ID " + this.ownerUUID + " Location " + this.getLoc().toString()); Logger.info("Building UID " + this.getObjectUUID() + " Failed to Load NPC Owner with ID " + this.ownerUUID + " Location " + this.getLoc().toString());