From 313d09906d44d7e289cc29c94ed2c4030edd7c2c Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Wed, 30 Jun 2021 02:02:35 +0200
Subject: [PATCH] Fixed DatabaseConnection not being loaded on startup

---
 .../java/com/alttd/chat/database/DatabaseConnection.java    | 5 +++--
 api/src/main/java/com/alttd/chat/objects/ChatUser.java      | 6 +++---
 galaxy/src/main/java/com/alttd/chat/ChatPlugin.java         | 2 ++
 velocity/src/main/java/com/alttd/chat/VelocityChat.java     | 3 +++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java
index 006385f..6c633db 100755
--- a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java
+++ b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java
@@ -43,6 +43,7 @@ public class DatabaseConnection {
             } catch (ClassNotFoundException e) {
                 e.printStackTrace();
             }
+
             connection = DriverManager.getConnection(
                     "jdbc:" + Config.DRIVER + "://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true&enabledTLSProtocols=TLSv1.1",
                     Config.USERNAME, Config.PASSWORD);
@@ -64,13 +65,13 @@ public class DatabaseConnection {
             e.printStackTrace();
         }
 
-        return instance.connection;
+        return connection;
     }
 
     /**
      * Sets the connection for this instance
      */
-    public boolean initialize() {
+    public static boolean initialize() {
         instance = new DatabaseConnection();
         return connection != null;
     }
diff --git a/api/src/main/java/com/alttd/chat/objects/ChatUser.java b/api/src/main/java/com/alttd/chat/objects/ChatUser.java
index 960b930..e4137a2 100755
--- a/api/src/main/java/com/alttd/chat/objects/ChatUser.java
+++ b/api/src/main/java/com/alttd/chat/objects/ChatUser.java
@@ -27,10 +27,10 @@ public class ChatUser {
         this.partyId = partyId;
         this.toggledPartyChat = toggledChat;
 
-        //displayName = Queries.getNickname(uuid); // todo fix sql
-        //if (displayName == null) {
+        displayName = Queries.getNickname(uuid); // todo fix sql
+        if (displayName == null) {
             displayName = Utility.getDisplayName(uuid);
-        //}
+        }
 
         prefix = Utility.getPrefix(uuid, true);
         staffPrefix = Utility.getStaffPrefix(uuid);
diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
index 0bd6f02..863bc3e 100755
--- a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
+++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
@@ -4,6 +4,7 @@ import com.alttd.chat.commands.GlobalChat;
 import com.alttd.chat.commands.Message;
 import com.alttd.chat.commands.Reply;
 import com.alttd.chat.config.Config;
+import com.alttd.chat.database.DatabaseConnection;
 import com.alttd.chat.handler.ChatHandler;
 import com.alttd.chat.listeners.ChatListener;
 import com.alttd.chat.listeners.PlayerListener;
@@ -28,6 +29,7 @@ public class ChatPlugin extends JavaPlugin {
         ALogger.init(getSLF4JLogger());
         chatAPI = new ChatImplementation();
         chatHandler = new ChatHandler();
+        DatabaseConnection.initialize();
         registerListener(new PlayerListener(), new ChatListener());
         registerCommand("globalchat", new GlobalChat());
         registerCommand("message", new Message());
diff --git a/velocity/src/main/java/com/alttd/chat/VelocityChat.java b/velocity/src/main/java/com/alttd/chat/VelocityChat.java
index 9a0e684..3444baf 100755
--- a/velocity/src/main/java/com/alttd/chat/VelocityChat.java
+++ b/velocity/src/main/java/com/alttd/chat/VelocityChat.java
@@ -2,6 +2,7 @@ package com.alttd.chat;
 
 import com.alttd.chat.commands.GlobalAdminChat;
 import com.alttd.chat.config.Config;
+import com.alttd.chat.database.DatabaseConnection;
 import com.alttd.chat.handlers.ChatHandler;
 import com.alttd.chat.handlers.ServerHandler;
 import com.alttd.chat.listeners.ChatListener;
@@ -51,7 +52,9 @@ public class VelocityChat {
     @Subscribe
     public void onProxyInitialization(ProxyInitializeEvent event) {
         ALogger.init(logger);
+
         chatAPI = new ChatImplementation();
+        DatabaseConnection.initialize();
 
         serverHandler = new ServerHandler();
         chatHandler = new ChatHandler();