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

Bane logic tweaking

bane-update2
MagicBot 4 months ago
parent
9ad5f239b0
commit
e082a0b49c
2 changed files with 68 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/engine/objects/Building.java
  2. 144
      src/engine/workthreads/DestroyCityThread.java

2
src/engine/objects/Building.java
Unescape View File

@ -561,7 +561,7 @@ public class Building extends AbstractWorldObject {
BuildingManager.setRank(barracksBuilding, -1); BuildingManager.setRank(barracksBuilding, -1);
} }
// If the tree is R8 and deranking, we need to update it's // If the tree is R8 and deranking, we need to update the
// mesh along with buildings losing their health bonus // mesh along with buildings losing their health bonus
if (this.rank == 8) { if (this.rank == 8) {

144
src/engine/workthreads/DestroyCityThread.java
Unescape View File

@ -53,120 +53,110 @@ public class DestroyCityThread implements Runnable {
// Member variable assignment // Member variable assignment
cityZone = city.getParent(); try {
newParent = cityZone.parent; cityZone = city.getParent();
formerGuild = city.getTOL().getGuild(); newParent = cityZone.parent;
formerGuild = city.getTOL().getGuild();
// Former guild loses it's tree! // Former guild loses 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(mbEnums.GuildState.Errant); formerGuild.setGuildState(mbEnums.GuildState.Errant);
formerGuild.setNation(null); formerGuild.setNation(null);
formerGuild.setCityUUID(0); formerGuild.setCityUUID(0);
GuildManager.updateAllGuildTags(formerGuild); GuildManager.updateAllGuildTags(formerGuild);
GuildManager.updateAllGuildBinds(formerGuild, null); 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()) { if (!formerGuild.getSubGuildList().isEmpty()) {
subGuildList = new ArrayList<>(); subGuildList = new ArrayList<>();
subGuildList.addAll(formerGuild.getSubGuildList()); subGuildList.addAll(formerGuild.getSubGuildList());
for (Guild subGuild : subGuildList) { for (Guild subGuild : subGuildList) {
formerGuild.removeSubGuild(subGuild); formerGuild.removeSubGuild(subGuild);
}
} }
}
Building tol = null; // 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 if (cityBuilding == null)
// before this thread can get to it continue;
if (cityBuilding == null) // Do nothing with the banestone. It will be removed elsewhere
continue;
// Do nothing with the banestone. It will be removed elsewhere if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
continue;
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE)) // All buildings are moved to a location relative
continue; // to their new parent zone
// TOL is processed after all other structures in the city zone localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL)) { DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
tol = cityBuilding;
continue;
}
// All buildings are moved to a location relative
// to their new parent zone
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 // No longer a tree, no longer any protection contract!
// higher in the tree (continent) as we will be
// deleting the city zone very shortly.
if (cityBuilding.getParentZoneID() != newParent.getParentZoneID()) cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
cityBuilding.setParentZone(newParent);
// No longer a tree, no longer any protection contract! // Remove warehouse entry if one exists.
cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE); if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) {
DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
city.warehouse = null;
}
// Remove warehouse entry if one exists. if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK)
|| (cityBuilding.getBlueprint().isWallPiece())
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SPIRE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE)) {
if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) { if (cityBuilding.getRank() != -1)
DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse); BuildingManager.setRank(cityBuilding, -1);
city.warehouse = null; }
} }
// Destroy all remaining city assets if (city.realm != null) {
city.realm.removeCity(city.getObjectUUID());
if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK) city.realm = null;
|| (cityBuilding.getBlueprint().isWallPiece())
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SPIRE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE)) {
if (cityBuilding.getRank() != -1)
BuildingManager.setRank(cityBuilding, -1);
} }
}
// Destroy the tol
if (tol != null) // It's now safe to delete the city zone from the database
BuildingManager.setRank(tol, -1); // which will cause a cascade delete of everything else
if (city.realm != null) if (DbManager.ZoneQueries.DELETE_ZONE(cityZone) == false) {
city.realm.removeCity(city.getObjectUUID()); Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
return;
}
// It's now safe to delete the city zone from the database // Refresh the city for map requests
// which will cause a cascade delete of everything else
City.lastCityUpdate = System.currentTimeMillis();
if (DbManager.ZoneQueries.DELETE_ZONE(cityZone) == false) { } catch (Exception e) {
Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID()); Logger.error(e);
return;
} }
// Refresh the city for map requests
City.lastCityUpdate = System.currentTimeMillis();
// Zone and city should vanish upon next reboot // Zone and city should vanish upon next reboot
// if the codebase reaches here. // if the codebase reaches here.

Write Preview
Loading…
Cancel
Save