From 4cf3135d481acd10d7b1cbe122f1caea4c64f998 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Thu, 18 Nov 2021 21:16:18 +0100
Subject: [PATCH] Fix family loading on server startup

Worlds need to be initialized before families due to an interdependency
---
 src/main/java/net/server/Server.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index a0394d23af..3d8db6bb66 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -857,10 +857,6 @@ public class Server {
             CashIdGenerator.loadExistentCashIdsFromDb(con);
             applyAllNameChanges(con); // -- name changes can be missed by INSTANT_NAME_CHANGE --
             applyAllWorldTransfers(con);
-
-            if (YamlConfig.config.server.USE_FAMILY_SYSTEM) {
-                Family.loadAllFamilies(con);
-            }
         } catch (SQLException sqle) {
             log.error("Failed to run all startup-bound database tasks", sqle);
             throw new IllegalStateException(sqle);
@@ -882,6 +878,12 @@ public class Server {
             initWorldPlayerRanking();
 
             loadPlayerNpcMapStepFromDb();
+
+            if (YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+                try (Connection con = DatabaseConnection.getConnection()) {
+                    Family.loadAllFamilies(con);
+                }
+            }
         } catch (Exception e) {
             e.printStackTrace();//For those who get errors
             log.error("[SEVERE] Syntax error in 'world.ini'.");
@@ -898,7 +900,6 @@ public class Server {
             }
         }
 
-        // acceptor = initAcceptor(8484);
         loginServer = initLoginServer(8484);
 
         log.info("Listening on port 8484");