Add command to reload MOTD1.56-changes

2 files changed, 34 insertions, 4 deletions

diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Config.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Config.java
index 5ae1e88..1f848ee 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Config.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Config.java
@@ -40,6 +40,7 @@ public class Config {
     private String serverLimit = "100";
     private boolean dbAutoReconnect = false;
     private boolean usingDatabase = false;
+    private String motdFile = null;
     private String motdMessage = null;
     private boolean motdFirstJoin = true;
     private int motdCooldown = 0;
@@ -79,7 +80,6 @@ public class Config {
         String customServersFile = null;
         String languageFile = null;
         String whitelistFile = null;
-        String motdFile = null;
 
         boolean mysqlSettingWarning = false;    
 
@@ -339,6 +339,12 @@ public class Config {
             }
         }
 
+        loadMotdMessage();
+
+        BedrockConnect.loadDatasource(dbHost, dbName, dbUser, dbPass, dbType, dbAutoReconnect, usingDatabase);
+    }
+
+    public void loadMotdMessage() {        
         if (motdFile != null) {
             try {
                 BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(motdFile), "UTF-8"));
@@ -349,14 +355,17 @@ public class Config {
                 }
                 motdMessage = msg + "\n";
                 in.close();
+                BedrockConnect.logger.info("Loaded MOTD");
                 BedrockConnect.logger.debug("MOTD data: " + motdMessage.toString());
             } catch (Exception e) {
                 BedrockConnect.logger.error("An error occurred reading the MOTD file", e);
-                System.exit(1);
             }
         }
+    }
 
-        BedrockConnect.loadDatasource(dbHost, dbName, dbUser, dbPass, dbType, dbAutoReconnect, usingDatabase);
+    public void loadMotdMessage(String file) {
+        motdFile = file;
+        loadMotdMessage();
     }
 
     public String getPort() {
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java
index 17049e6..5b52d16 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/Server.java
@@ -104,12 +104,33 @@ public class Server {
                     try {
                         sc = new Scanner(System.in);
                         while(sc.hasNextLine()) {
-                            String cmd = sc.next();
+                            String line = sc.nextLine(); 
+                            String[] parts = line.trim().split("\\s+");
+
+                            if (parts.length == 0) {
+                                continue;
+                            }
+
+                            String cmd = parts[0];
                             switch(cmd) {
                                 case "end":
                                 case "stop":
                                     System.exit(0);
                                     break;
+                                case "reload":
+                                    if (parts.length > 1) {
+                                        String arg = parts[1];
+                                        switch(arg) {
+                                            case "motd":
+                                                if (parts.length > 2) {
+                                                    BedrockConnect.getConfig().loadMotdMessage(parts[2]);
+                                                } else {
+                                                    BedrockConnect.getConfig().loadMotdMessage();
+                                                }
+                                                break;
+                                        }
+                                    }
+                                    break;
                             }
                         }
                     } catch (Exception e) {