From 8f394cd01d2d575256da0e599e0626b2afb12200 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sat, 7 Sep 2024 18:01:23 -0500
Subject: [PATCH] fixed login bug

---
 src/engine/db/handlers/dbCityHandler.java | 21 ++++-----------------
 src/engine/objects/Mine.java              |  2 +-
 src/engine/server/login/LoginServer.java  |  3 +++
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/engine/db/handlers/dbCityHandler.java b/src/engine/db/handlers/dbCityHandler.java
index 39af8978..c3ae4dc7 100644
--- a/src/engine/db/handlers/dbCityHandler.java
+++ b/src/engine/db/handlers/dbCityHandler.java
@@ -11,10 +11,7 @@ package engine.db.handlers;
 
 import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.Building;
-import engine.objects.City;
-import engine.objects.Zone;
+import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
 import java.sql.*;
@@ -98,19 +95,9 @@ public class dbCityHandler extends dbHandlerBase {
     public Integer GET_CAPITAL_CITY_COUNT() {
 
         int cityCount = 0;
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM obj_city;")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while(rs.next()){
-                if(rs.getInt("isNpc") == 0)
-                    if(DbManager.BuildingQueries.GET_BUILDINGBYUUID(rs.getInt("treeOfLifeUUID")).getRank() == 8)
-                        cityCount++;
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
+        for(Realm realm : Realm._realms.values()){
+            if(realm.isRuled())
+                cityCount ++;
         }
 
         return cityCount;
diff --git a/src/engine/objects/Mine.java b/src/engine/objects/Mine.java
index b6f9bca5..882b6b20 100644
--- a/src/engine/objects/Mine.java
+++ b/src/engine/objects/Mine.java
@@ -504,7 +504,7 @@ public class Mine extends AbstractGameObject {
             return false;
 
         ItemBase resourceIB = ItemBase.getItemBase(this.production.UUID);
-        return this.owningGuild.getOwnedCity().getWarehouse().depositFromMine(this, resourceIB, (int)(this.getModifiedProductionAmount() * 0.5f));
+        return this.owningGuild.getOwnedCity().getWarehouse().depositFromMine(this, resourceIB, this.getModifiedProductionAmount());
     }
 
     public boolean updateGuildOwner(PlayerCharacter playerCharacter) {
diff --git a/src/engine/server/login/LoginServer.java b/src/engine/server/login/LoginServer.java
index cdaaf1d3..59fe0c6a 100644
--- a/src/engine/server/login/LoginServer.java
+++ b/src/engine/server/login/LoginServer.java
@@ -210,6 +210,9 @@ public class LoginServer {
                 nextServerTime = LocalDateTime.now().plusSeconds(1);
             }
 
+            //load realm for the server pop creation screen
+            Realm.loadAllRealms();
+
             if (LocalDateTime.now().isAfter(nextDatabaseTime)) {
                 String pop = SimulationManager.getPopulationString();
                 Logger.info("Keepalive: " + pop);