forked from MagicBane/Server
Renamed class to not conflict with the java.lang version.
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
|
||||
package engine.objects;
|
||||
|
||||
import engine.Enum;
|
||||
import engine.InterestManagement.RealmMap;
|
||||
import engine.InterestManagement.WorldGrid;
|
||||
import engine.db.archive.DataWarehouse;
|
||||
@@ -18,6 +17,7 @@ import engine.gameManager.BuildingManager;
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.gameManager.GuildManager;
|
||||
import engine.gameManager.PowersManager;
|
||||
import engine.mbEnums;
|
||||
import engine.net.ByteBufferWriter;
|
||||
import engine.net.client.msg.ErrorPopupMsg;
|
||||
import engine.powers.PowersBase;
|
||||
@@ -32,7 +32,7 @@ import java.time.ZoneId;
|
||||
import java.util.HashSet;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import static engine.Enum.CharterType;
|
||||
import static engine.mbEnums.CharterType;
|
||||
|
||||
|
||||
public class Realm {
|
||||
@@ -234,27 +234,27 @@ public class Realm {
|
||||
return false;
|
||||
}
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.GOLD);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.GOLD);
|
||||
|
||||
if (resourceValue < 5000000)
|
||||
hasResources = false;
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.STONE);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.STONE);
|
||||
|
||||
if (resourceValue < 8000)
|
||||
hasResources = false;
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.LUMBER);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.LUMBER);
|
||||
|
||||
if (resourceValue < 8000)
|
||||
hasResources = false;
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.GALVOR);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.GALVOR);
|
||||
|
||||
if (resourceValue < 15)
|
||||
hasResources = false;
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.WORMWOOD);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.WORMWOOD);
|
||||
|
||||
if (resourceValue < 15)
|
||||
hasResources = false;
|
||||
@@ -266,50 +266,50 @@ public class Realm {
|
||||
|
||||
// Remove resources from warehouse before claiming realm
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.GOLD);
|
||||
warehouse.resources.put(Enum.ResourceType.GOLD, resourceValue - 5000000);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.GOLD);
|
||||
warehouse.resources.put(mbEnums.ResourceType.GOLD, resourceValue - 5000000);
|
||||
|
||||
if (!DbManager.WarehouseQueries.UPDATE_WAREHOUSE(warehouse)) {
|
||||
Logger.error("gold update failed for warehouse of city:" + warehouse.city.getName());
|
||||
warehouse.resources.put(Enum.ResourceType.GOLD, resourceValue);
|
||||
warehouse.resources.put(mbEnums.ResourceType.GOLD, resourceValue);
|
||||
return false;
|
||||
}
|
||||
|
||||
Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Enum.ResourceType.GOLD, 5000000);
|
||||
Warehouse.AddTransactionToWarehouse(warehouse, mbEnums.GameObjectType.Building, tol.getObjectUUID(), mbEnums.TransactionType.WITHDRAWL, mbEnums.ResourceType.GOLD, 5000000);
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.STONE);
|
||||
warehouse.resources.put(Enum.ResourceType.STONE, resourceValue - 8000);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.STONE);
|
||||
warehouse.resources.put(mbEnums.ResourceType.STONE, resourceValue - 8000);
|
||||
|
||||
if (!DbManager.WarehouseQueries.UPDATE_WAREHOUSE(warehouse)) {
|
||||
Logger.error("stone update failed for warehouse of city:" + warehouse.city.getName());
|
||||
warehouse.resources.put(Enum.ResourceType.STONE, resourceValue);
|
||||
warehouse.resources.put(mbEnums.ResourceType.STONE, resourceValue);
|
||||
return false;
|
||||
}
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.LUMBER);
|
||||
warehouse.resources.put(Enum.ResourceType.LUMBER, resourceValue - 8000);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.LUMBER);
|
||||
warehouse.resources.put(mbEnums.ResourceType.LUMBER, resourceValue - 8000);
|
||||
|
||||
if (!DbManager.WarehouseQueries.UPDATE_WAREHOUSE(warehouse)) {
|
||||
Logger.error("lumber update failed for warehouse of city:" + warehouse.city.getName());
|
||||
warehouse.resources.put(Enum.ResourceType.LUMBER, resourceValue);
|
||||
warehouse.resources.put(mbEnums.ResourceType.LUMBER, resourceValue);
|
||||
return false;
|
||||
}
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.GALVOR);
|
||||
warehouse.resources.put(Enum.ResourceType.GALVOR, resourceValue - 15);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.GALVOR);
|
||||
warehouse.resources.put(mbEnums.ResourceType.GALVOR, resourceValue - 15);
|
||||
|
||||
if (!DbManager.WarehouseQueries.UPDATE_WAREHOUSE(warehouse)) {
|
||||
Logger.error("GALVOR update failed for warehouse of city:" + warehouse.city.getName());
|
||||
warehouse.resources.put(Enum.ResourceType.GALVOR, resourceValue);
|
||||
warehouse.resources.put(mbEnums.ResourceType.GALVOR, resourceValue);
|
||||
return false;
|
||||
}
|
||||
|
||||
resourceValue = warehouse.resources.get(Enum.ResourceType.WORMWOOD);
|
||||
warehouse.resources.put(Enum.ResourceType.WORMWOOD, resourceValue - 15);
|
||||
resourceValue = warehouse.resources.get(mbEnums.ResourceType.WORMWOOD);
|
||||
warehouse.resources.put(mbEnums.ResourceType.WORMWOOD, resourceValue - 15);
|
||||
|
||||
if (!DbManager.WarehouseQueries.UPDATE_WAREHOUSE(warehouse)) {
|
||||
Logger.error("WORMWOOD update failed for warehouse of city:" + warehouse.city.getName());
|
||||
warehouse.resources.put(Enum.ResourceType.WORMWOOD, resourceValue);
|
||||
warehouse.resources.put(mbEnums.ResourceType.WORMWOOD, resourceValue);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -323,7 +323,7 @@ public class Realm {
|
||||
if (building.getBlueprintUUID() != 0) {
|
||||
|
||||
// TOL Health set through regular linear equation
|
||||
if (building.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.TOL) {
|
||||
if (building.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -442,13 +442,13 @@ public class Realm {
|
||||
writer.putString(this.realmName);
|
||||
|
||||
if (isRuled() == true) {
|
||||
writer.putInt(Enum.GameObjectType.Guild.ordinal());
|
||||
writer.putInt(mbEnums.GameObjectType.Guild.ordinal());
|
||||
writer.putInt(rulingNationUUID);
|
||||
|
||||
writer.putInt(rulingCharacterOrdinal);
|
||||
writer.putInt(rulingCharacterUUID);
|
||||
|
||||
writer.putInt(Enum.GameObjectType.City.ordinal());
|
||||
writer.putInt(mbEnums.GameObjectType.City.ordinal());
|
||||
writer.putInt(rulingCityUUID);
|
||||
|
||||
writer.putLocalDateTime(this.ruledSince);
|
||||
@@ -505,7 +505,7 @@ public class Realm {
|
||||
|
||||
// Push event to warehouse
|
||||
|
||||
RealmRecord realmRecord = RealmRecord.borrow(this, Enum.RecordEventType.LOST);
|
||||
RealmRecord realmRecord = RealmRecord.borrow(this, mbEnums.RecordEventType.LOST);
|
||||
DataWarehouse.pushToWarehouse(realmRecord);
|
||||
|
||||
// No longer own a realm
|
||||
@@ -532,7 +532,7 @@ public class Realm {
|
||||
|
||||
// Push event to warehouse
|
||||
|
||||
RealmRecord realmRecord = RealmRecord.borrow(this, Enum.RecordEventType.CAPTURE);
|
||||
RealmRecord realmRecord = RealmRecord.borrow(this, mbEnums.RecordEventType.CAPTURE);
|
||||
DataWarehouse.pushToWarehouse(realmRecord);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user