From 5af1687f190be588203ce62a73cdea2a1b47c391 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 19 Feb 2023 07:48:50 -0500 Subject: [PATCH] Maintenance hour and bot/game version config entries removed. --- src/discord/handlers/StatusRequestHandler.java | 6 +----- src/engine/gameManager/ConfigManager.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/discord/handlers/StatusRequestHandler.java b/src/discord/handlers/StatusRequestHandler.java index 7f173d9d..473ca172 100644 --- a/src/discord/handlers/StatusRequestHandler.java +++ b/src/discord/handlers/StatusRequestHandler.java @@ -20,12 +20,8 @@ public class StatusRequestHandler { String outString; - // Add version information - outString = "MagicBot: " + ConfigManager.MB_MAGICBOT_BOTVERSION.getValue() + "\n" + - "MagicBane: " + ConfigManager.MB_MAGICBOT_GAMEVERSION.getValue() + "\n"; - // Add server status info - outString += "\nServer Status: "; + outString = "Server Status: "; if (LoginServer.isPortInUse(Integer.parseInt(ConfigManager.MB_WORLD_PORT.getValue()))) outString += "ONLINE\n"; diff --git a/src/engine/gameManager/ConfigManager.java b/src/engine/gameManager/ConfigManager.java index 83c5d57c..adcb601c 100644 --- a/src/engine/gameManager/ConfigManager.java +++ b/src/engine/gameManager/ConfigManager.java @@ -63,10 +63,14 @@ public enum ConfigManager { MB_WORLD_UUID, MB_WORLD_WAREHOUSE_PUSH, MB_WORLD_MAINTENANCE, - MB_WORLD_MAINTENANCE_HOUR, MB_WORLD_GREETING, MB_WORLD_KEYCLONE_MAX, + //drop rates + MB_NORMAL_RATE, + MB_HOTZONE_RATE, + MB_HOTZONE_DURATION, + // MagicBot configuration. MB_MAGICBOT_SERVERID, @@ -79,13 +83,8 @@ public enum ConfigManager { MB_MAGICBOT_GENERAL, MB_MAGICBOT_FORTOFIX, MB_MAGICBOT_RECRUIT, - MB_MAGICBOT_ADMINLOG, - MB_MAGICBOT_BOTVERSION, - MB_MAGICBOT_GAMEVERSION, - //drop rates - MB_NORMAL_RATE, - MB_HOTZONE_RATE, - MB_HOTZONE_DURATION; + MB_MAGICBOT_ADMINLOG; + // Map to hold our config pulled in from the environment // We also use the config to point to the current message pump // and determine the server type at runtime.