Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
+80 -80
View File
@@ -33,123 +33,123 @@ import java.util.ArrayList;
public class DestroyCityThread implements Runnable {
City city;
City city;
public DestroyCityThread(City city) {
public DestroyCityThread(City city) {
this.city = city;
}
this.city = city;
}
public void run(){
public void run() {
// Member variable declaration
// Member variable declaration
Zone cityZone;
Zone newParent;
Guild formerGuild;
Vector3fImmutable localCoords;
ArrayList<Guild> subGuildList;
Zone cityZone;
Zone newParent;
Guild formerGuild;
Vector3fImmutable localCoords;
ArrayList<Guild> subGuildList;
// Member variable assignment
// Member variable assignment
cityZone = city.getParent();
newParent = cityZone.getParent();
formerGuild = city.getTOL().getGuild();
cityZone = city.getParent();
newParent = cityZone.getParent();
formerGuild = city.getTOL().getGuild();
// Former guild loses it's tree!
// Former guild loses it's tree!
if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
//Successful Update of guild
//Successful Update of guild
formerGuild.setGuildState(engine.Enum.GuildState.Errant);
formerGuild.setNation(null);
formerGuild.setCityUUID(0);
GuildManager.updateAllGuildTags(formerGuild);
GuildManager.updateAllGuildBinds(formerGuild, null);
}
formerGuild.setGuildState(engine.Enum.GuildState.Errant);
formerGuild.setNation(null);
formerGuild.setCityUUID(0);
GuildManager.updateAllGuildTags(formerGuild);
GuildManager.updateAllGuildBinds(formerGuild, null);
}
// By losing the tree, the former owners lose all of their subguilds.
// By losing the tree, the former owners lose all of their subguilds.
if (formerGuild.getSubGuildList().isEmpty() == false) {
if (formerGuild.getSubGuildList().isEmpty() == false) {
subGuildList = new ArrayList<>();
subGuildList = new ArrayList<>();
for (Guild subGuild : formerGuild.getSubGuildList()) {
subGuildList.add(subGuild);
}
for (Guild subGuild : formerGuild.getSubGuildList()) {
subGuildList.add(subGuild);
}
for (Guild subGuild : subGuildList) {
formerGuild.removeSubGuild(subGuild);
}
}
for (Guild subGuild : subGuildList) {
formerGuild.removeSubGuild(subGuild);
}
}
// Build list of buildings within this parent zone
// Build list of buildings within this parent zone
for (Building cityBuilding : cityZone.zoneBuildingSet) {
for (Building cityBuilding : cityZone.zoneBuildingSet) {
// Sanity Check in case player deletes the building
// before this thread can get to it
// Sanity Check in case player deletes the building
// before this thread can get to it
if (cityBuilding == null)
continue;
if (cityBuilding == null)
continue;
// Do nothing with the banestone. It will be removed elsewhere
// Do nothing with the banestone. It will be removed elsewhere
if (cityBuilding.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BANESTONE))
continue;
// All buildings are moved to a location relative
// to their new parent zone
if (cityBuilding.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BANESTONE))
continue;
localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
// All buildings are moved to a location relative
// to their new parent zone
DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
// All buildings are re-parented to a zone one node
// higher in the tree (continent) as we will be
// deleting the city zone very shortly.
DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
cityBuilding.setParentZone(newParent);
// All buildings are re-parented to a zone one node
// higher in the tree (continent) as we will be
// deleting the city zone very shortly.
// No longer a tree, no longer any protection contract!
if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
cityBuilding.setParentZone(newParent);
cityBuilding.setProtectionState(Enum.ProtectionState.NONE);
// No longer a tree, no longer any protection contract!
// Destroy all remaining city assets
cityBuilding.setProtectionState(Enum.ProtectionState.NONE);
if ((cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.BARRACK)
|| (cityBuilding.getBlueprint().isWallPiece())
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.SHRINE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.TOL)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.SPIRE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.WAREHOUSE)) {
// Destroy all remaining city assets
if (cityBuilding.getRank() != -1)
cityBuilding.setRank(-1);
}
}
if ((cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.BARRACK)
|| (cityBuilding.getBlueprint().isWallPiece())
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.SHRINE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.TOL)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.SPIRE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.WAREHOUSE)) {
if (city.getRealm() != null)
city.getRealm().removeCity(city.getObjectUUID());
if (cityBuilding.getRank() != -1)
cityBuilding.setRank(-1);
}
}
// It's now safe to delete the city zone from the database
// which will cause a cascade delete of everything else
if (city.getRealm() != null)
city.getRealm().removeCity(city.getObjectUUID());
// It's now safe to delete the city zone from the database
// which will cause a cascade delete of everything else
if (DbManager.ZoneQueries.DELETE_ZONE(cityZone) == false) {
Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
return;
}
if (DbManager.ZoneQueries.DELETE_ZONE(cityZone) == false) {
Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
return;
}
// Refresh the city for map requests
// Refresh the city for map requests
City.lastCityUpdate = System.currentTimeMillis();
City.lastCityUpdate = System.currentTimeMillis();
// Zone and city should vanish upon next reboot
// if the codebase reaches here.
// Zone and city should vanish upon next reboot
// if the codebase reaches here.
Logger.info(city.getParent().getName() + " uuid:" + city.getObjectUUID() + "has been destroyed!");
}
Logger.info(city.getParent().getName() + " uuid:" + city.getObjectUUID() + "has been destroyed!");
}
}