From d9125566f7ed87a67abc9ea577c92f70a19a729b Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 19 Feb 2023 08:39:28 -0500 Subject: [PATCH] Drop rates are set by ConfigManager --- src/engine/gameManager/ConfigManager.java | 19 +++++++++++-------- src/engine/server/world/WorldServer.java | 4 ---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/engine/gameManager/ConfigManager.java b/src/engine/gameManager/ConfigManager.java index adcb601c..4cf9da5c 100644 --- a/src/engine/gameManager/ConfigManager.java +++ b/src/engine/gameManager/ConfigManager.java @@ -96,16 +96,12 @@ public enum ConfigManager { public static LoginServer loginServer; public static Map regex = new HashMap<>(); - //drop rates pulled form config file - - public float amountOfStuffYouGetInHotzones; - // Called at bootstrap: ensures that all config values are loaded. public static boolean init() { - Logger.info("ConfigManager: init()"); + Logger.info("Loading config from environment..."); for (ConfigManager configSetting : ConfigManager.values()) if (configMap.containsKey(configSetting.name())) @@ -117,10 +113,17 @@ public enum ConfigManager { return false; } - // compile regex here + // Setting drop rates + + Logger.info("Setting drop rates..."); + Enum.DropRateType.init(); + + // compile regex here + + Logger.info("Compiling regex"); - regex.put(MB_LOGIN_FNAME_REGEX, Pattern.compile(MB_LOGIN_FNAME_REGEX.getValue())); - return true; + regex.put(MB_LOGIN_FNAME_REGEX, Pattern.compile(MB_LOGIN_FNAME_REGEX.getValue())); + return true; } // Get the value associated with this enumeration diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index dc675f45..70a5f3fa 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -483,10 +483,6 @@ public class WorldServer { Logger.info("Running garbage collection..."); System.gc(); - //set drop rates from config file - - Logger.info("Setting drop rates..."); - Enum.DropRateType.init(); return true; }