From 9da4b85dd18c1874eacd74b38c52fcb19da8ffa9 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Fri, 12 Apr 2024 21:33:51 -0500 Subject: [PATCH] realm cleanup --- src/engine/objects/Realm.java | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/engine/objects/Realm.java b/src/engine/objects/Realm.java index 319a1e15..2e0b43c3 100644 --- a/src/engine/objects/Realm.java +++ b/src/engine/objects/Realm.java @@ -77,26 +77,12 @@ public class Realm { this.mapB = (float) (mapColor.getBlue() * 0.00392156863); this.mapA = 1; this.realmName = rs.getString("realmName"); - if(this.realmName.toLowerCase().equals("oblivion") || this.realmName.toLowerCase().equals("maelstrom")){ - this.canBeClaimed = true; - this.canPlaceCities = true; - this.numCities = 5; - }else { - this.canBeClaimed = rs.getBoolean("canBeClaimed"); - this.canPlaceCities = rs.getBoolean("canPlaceCities"); - this.numCities = rs.getInt("numCities"); - } + this.canBeClaimed = rs.getBoolean("canBeClaimed"); + this.canPlaceCities = rs.getBoolean("canPlaceCities"); + this.numCities = rs.getInt("numCities"); this.rulingCityUUID = rs.getInt("rulingCityUID"); this.charterType = rs.getInt("charterType"); - java.sql.Timestamp ruledTimeStamp = rs.getTimestamp("ruledSince"); - - if (ruledTimeStamp != null){ - this.ruledSince = LocalDateTime.ofInstant(ruledTimeStamp.toInstant(), ZoneId.systemDefault()); - }else { - this.rulingCityUUID = 0; - this.charterType = 0; - } this.mapY1 = rs.getFloat("mapY1"); this.mapX1 = rs.getFloat("mapX1"); this.mapY2 = rs.getFloat("mapY2");