From fb390d4b69cc190eab01517baa5bb8aa4ce7603c Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Mon, 29 Nov 2021 19:09:39 +0000
Subject: [PATCH] Fix issue with SQLite database naming

---
 build.gradle                                                | 2 +-
 .../main/java/me/william278/husksync/HuskSyncBukkit.java    | 4 ++--
 .../{EventListener.java => BukkitEventListener.java}        | 2 +-
 .../william278/husksync/bungeecord/config/ConfigLoader.java | 3 ++-
 .../husksync/bungeecord/listener/BungeeRedisListener.java   | 6 ++++--
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename bukkit/src/main/java/me/william278/husksync/bukkit/listener/{EventListener.java => BukkitEventListener.java} (99%)

diff --git a/build.gradle b/build.gradle
index b88cf3ad..873ec5d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ plugins {
 
 allprojects {
     group 'me.William278'
-    version '1.1'
+    version '1.1.1'
 
     compileJava { options.encoding = 'UTF-8' }
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
diff --git a/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java b/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java
index 0130c14b..78b3eab6 100644
--- a/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java
+++ b/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java
@@ -5,7 +5,7 @@ import me.william278.husksync.bukkit.util.PlayerSetter;
 import me.william278.husksync.bukkit.config.ConfigLoader;
 import me.william278.husksync.bukkit.data.BukkitDataCache;
 import me.william278.husksync.bukkit.listener.BukkitRedisListener;
-import me.william278.husksync.bukkit.listener.EventListener;
+import me.william278.husksync.bukkit.listener.BukkitEventListener;
 import me.william278.husksync.bukkit.migrator.MPDBDeserializer;
 import me.william278.husksync.redis.RedisMessage;
 import org.bstats.bukkit.Metrics;
@@ -116,7 +116,7 @@ public final class HuskSyncBukkit extends JavaPlugin {
         bukkitCache = new BukkitDataCache();
 
         // Initialize event listener
-        getServer().getPluginManager().registerEvents(new EventListener(), this);
+        getServer().getPluginManager().registerEvents(new BukkitEventListener(), this);
 
         // Initialize the redis listener
         if (!new BukkitRedisListener().isActiveAndEnabled) {
diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/listener/EventListener.java b/bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitEventListener.java
similarity index 99%
rename from bukkit/src/main/java/me/william278/husksync/bukkit/listener/EventListener.java
rename to bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitEventListener.java
index 899633e7..89a56923 100644
--- a/bukkit/src/main/java/me/william278/husksync/bukkit/listener/EventListener.java
+++ b/bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitEventListener.java
@@ -18,7 +18,7 @@ import org.bukkit.event.player.*;
 import java.io.IOException;
 import java.util.logging.Level;
 
-public class EventListener implements Listener {
+public class BukkitEventListener implements Listener {
 
     private static final HuskSyncBukkit plugin = HuskSyncBukkit.getInstance();
 
diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java b/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java
index b2bb4ec6..04e5298b 100644
--- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java
+++ b/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java
@@ -61,10 +61,11 @@ public class ConfigLoader {
 
         // Read cluster data
         Configuration section = config.getSection("clusters");
+        final String settingDatabaseName = Settings.mySQLDatabase != null ? Settings.mySQLDatabase : "HuskSync";
         for (String clusterId : section.getKeys()) {
             final String playerTableName = config.getString("clusters." + clusterId + ".player_table", "husksync_players");
             final String dataTableName = config.getString("clusters." + clusterId + ".data_table", "husksync_data");
-            final String databaseName = config.getString("clusters." + clusterId + ".database", Settings.mySQLDatabase);
+            final String databaseName = config.getString("clusters." + clusterId + ".database", settingDatabaseName);
             Settings.clusters.add(new Settings.SynchronisationCluster(clusterId, databaseName, playerTableName, dataTableName));
         }
     }
diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java b/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java
index 807423ed..f1b128b8 100644
--- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java
+++ b/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java
@@ -81,8 +81,10 @@ public class BungeeRedisListener extends RedisListener {
 
                         // Send synchronisation complete message
                         ProxiedPlayer player = ProxyServer.getInstance().getPlayer(requestingPlayerUUID);
-                        if (player.isConnected()) {
-                            player.sendMessage(ChatMessageType.ACTION_BAR, new MineDown(MessageManager.getMessage("synchronisation_complete")).toComponent());
+                        if (player != null) {
+                            if (player.isConnected()) {
+                                player.sendMessage(ChatMessageType.ACTION_BAR, new MineDown(MessageManager.getMessage("synchronisation_complete")).toComponent());
+                            }
                         }
                     } catch (IOException e) {
                         log(Level.SEVERE, "Failed to serialize data when replying to a data request");