From 2bfdc0f203090ace61e85cb9e2867aed087720c2 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sat, 24 Feb 2024 21:14:58 -0600 Subject: [PATCH] zone override --- src/engine/objects/Realm.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/engine/objects/Realm.java b/src/engine/objects/Realm.java index 2c03ab98..2a9511b4 100644 --- a/src/engine/objects/Realm.java +++ b/src/engine/objects/Realm.java @@ -76,33 +76,35 @@ public class Realm { this.mapG = (float) (mapColor.getGreen() * 0.00392156863); this.mapB = (float) (mapColor.getBlue() * 0.00392156863); this.mapA = 1; - if(overridePlacement(rs.getString("realmName"))){ + if (overridePlacement(rs.getString("realmName"))) { this.canBeClaimed = false; this.canPlaceCities = false; this.numCities = 0; this.rulingCityUUID = 0; this.charterType = 0; this.realmName = "Plagued Land"; - }else { + } else { this.canBeClaimed = rs.getBoolean("canBeClaimed"); this.canPlaceCities = rs.getBoolean("canPlaceCities"); this.numCities = rs.getInt("numCities"); this.rulingCityUUID = rs.getInt("rulingCityUID"); - if(this.rulingCityUUID == 0){ + if (this.rulingCityUUID == 0) { this.charterType = rs.getInt("charterType"); - }else { + } else { this.charterType = 0; } this.realmName = rs.getString("realmName"); } - java.sql.Timestamp ruledTimeStamp = rs.getTimestamp("ruledSince"); - if (ruledTimeStamp != null) + 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");