Compare commits

...

12 Commits

  1. 2
      src/engine/gameManager/BuildingManager.java
  2. 2
      src/engine/mbEnums.java
  3. 2
      src/engine/objects/Building.java
  4. 29
      src/engine/objects/City.java
  5. 3
      src/engine/objects/Mine.java
  6. 144
      src/engine/workthreads/DestroyCityThread.java

2
src/engine/gameManager/BuildingManager.java

@ -798,7 +798,7 @@ public enum BuildingManager {
// Attempt to write to database or delete the building // Attempt to write to database or delete the building
// if we are destroying it. // if we are destroying it.
if (rank == -1) if (rank < 0)
success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building); success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
else else
success = DbManager.BuildingQueries.updateBuildingRank(building, rank); success = DbManager.BuildingQueries.updateBuildingRank(building, rank);

2
src/engine/mbEnums.java

@ -2732,7 +2732,7 @@ public class mbEnums {
DIAMOND(1580010, 1540225085, -1730704107, 2000, 20), DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
GALVOR(1580017, -1683992404, -1596311545, 2000, 5), GALVOR(1580017, -1683992404, -1596311545, 2000, 5),
IRON(1580002, -1673518119, 2504297, 2000, 20), IRON(1580002, -1673518119, 2504297, 2000, 20),
LUMBER(1580004, 1628412684, -1603256692, 10000, 100), LUMBER(1580004, -1628412684, -1603256692, 10000, 100),
MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10), MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10),
MITHRIL(1580021, 626743397, -1761257186, 500, 5), MITHRIL(1580021, 626743397, -1761257186, 500, 5),
OAK(1580005, -1653034775, 74767, 3000, 30), OAK(1580005, -1653034775, 74767, 3000, 30),

2
src/engine/objects/Building.java

@ -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) {

29
src/engine/objects/City.java

@ -41,6 +41,7 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
public class City extends AbstractWorldObject { public class City extends AbstractWorldObject {
@ -80,6 +81,7 @@ public class City extends AbstractWorldObject {
private String hash; private String hash;
public Warehouse warehouse; public Warehouse warehouse;
public Realm realm; public Realm realm;
public AtomicBoolean isDestroyed = new AtomicBoolean(false);
/** /**
* ResultSet Constructor * ResultSet Constructor
@ -306,6 +308,21 @@ public class City extends AbstractWorldObject {
if (city.parentZone == null) if (city.parentZone == null)
continue; continue;
// Can't teleport to something without a tree
if (city.getTOL() == null)
continue;
// No abandoned cities
if (city.getTOL().getGuild().isEmptyGuild())
continue;
// No destroyed cities
if (city.getTOL().getRank() == -1)
continue;
//can't repledge to a guild you're already part of //can't repledge to a guild you're already part of
if (repledge && city.getGuild().equals(playerCharacter.guild)) if (repledge && city.getGuild().equals(playerCharacter.guild))
@ -1102,17 +1119,21 @@ public class City extends AbstractWorldObject {
public final void destroy() { public final void destroy() {
Thread destroyCityThread = new Thread(new DestroyCityThread(this)); if (this.isDestroyed.compareAndSet(false, true)) {
destroyCityThread.setName("destroyCity:" + this.getName()); Thread destroyCityThread = new Thread(new DestroyCityThread(this));
destroyCityThread.start();
destroyCityThread.setName("destroyCity:" + this.getParent().zoneName);
destroyCityThread.start();
} else
Logger.error("Attempt to destroy destroyed city");
} }
public final void transfer(AbstractCharacter newOwner) { public final void transfer(AbstractCharacter newOwner) {
Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner)); Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
transferCityThread.setName("TransferCity:" + this.getName()); transferCityThread.setName("TransferCity:" + this.getParent().zoneName);
transferCityThread.start(); transferCityThread.start();
} }

3
src/engine/objects/Mine.java

@ -220,8 +220,7 @@ public class Mine extends AbstractGameObject {
// Only inactive mines are returned. // Only inactive mines are returned.
for (Mine mine : Mine.mineMap.keySet()) { for (Mine mine : Mine.mineMap.keySet()) {
if (mine.owningGuild.getObjectUUID() == guildID && if (mine.owningGuild.getObjectUUID() == guildID)
mine.isActive == false)
mineList.add(mine); mineList.add(mine);
} }
return mineList; return mineList;

144
src/engine/workthreads/DestroyCityThread.java

@ -53,123 +53,117 @@ 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! Logger.info("Destroy city thread started for: " + cityZone.zoneName);
if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) { // Former guild loses tree!
//Successful Update of guild if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
formerGuild.setGuildState(mbEnums.GuildState.Errant); //Successful Update of guild
formerGuild.setNation(null);
formerGuild.setCityUUID(0); formerGuild.setGuildState(mbEnums.GuildState.Errant);
GuildManager.updateAllGuildTags(formerGuild); formerGuild.setNation(null);
GuildManager.updateAllGuildBinds(formerGuild, 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()) { 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 ArrayList<Building> destroySet = new ArrayList<>();
for (Building cityBuilding : cityZone.zoneBuildingSet) { for (Building cityBuilding : cityZone.zoneBuildingSet) {
// Sanity Check in case player deletes the building // Sanity Check in case player deletes the building
// before this thread can get to it // before this thread can get to it
if (cityBuilding == null) if (cityBuilding == null)
continue; 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(mbEnums.BuildingGroup.BANESTONE)) if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
continue; continue;
// TOL is processed after all other structures in the city zone // All buildings are moved to a location relative
// to their new parent zone
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL)) { localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
tol = cityBuilding;
continue;
}
// All buildings are moved to a location relative DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
// 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. // Mark all auto protected buildings for destruction
if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) { 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))
DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse); destroySet.add(cityBuilding);
city.warehouse = null;
} }
// Destroy all remaining city assets // Destroy set of auto-protected buildings
if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK) for (Building building : destroySet)
|| (cityBuilding.getBlueprint().isWallPiece()) if (building.getRank() != -1)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE) BuildingManager.setRank(building, -1);
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SPIRE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE)) {
if (cityBuilding.getRank() != -1) if (city.realm != null) {
BuildingManager.setRank(cityBuilding, -1); city.realm.removeCity(city.getObjectUUID());
city.realm = null;
} }
}
// 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)) {
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.
Logger.info(city.getParent().zoneName + " uuid:" + city.getObjectUUID() + "has been destroyed!"); Logger.info(city.getParent().zoneName + " uuid: " + city.getObjectUUID() + " has been destroyed!");
} }
} }

Loading…
Cancel
Save