From c29f311f1e5b370a5ce8f1e323d5d231abb75ab9 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Fri, 16 Apr 2021 12:24:02 -0700
Subject: [PATCH] More proper fix

---
 Changelog.txt                                            | 3 +++
 pom.xml                                                  | 2 +-
 src/main/java/com/gmail/nossr50/locale/LocaleLoader.java | 1 +
 src/main/java/com/gmail/nossr50/mcMMO.java               | 3 +--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 9ce8d58c1..7227a5083 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 2.1.194
+    Fixed a bug where mcMMO didn't properly setup file paths for locale override
+
 Version 2.1.193
     Fixed another bug where mcrank/mctop/leaderboards weren't loading
     Fixed a bug where override locales weren't being loaded (but worked after a reloadlocale command)
diff --git a/pom.xml b/pom.xml
index 97c687111..6cc309b22 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.193</version>
+    <version>2.1.194-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
index 2cfcc4052..cf8d5bfb0 100644
--- a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
+++ b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
@@ -152,6 +152,7 @@ public final class LocaleLoader {
                     mcMMO.p.getLogger().log(Level.WARNING, "Failed to load locale from " + localePath, e);
                 }
             }
+
             bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale);
             enBundle = ResourceBundle.getBundle(BUNDLE_ROOT, Locale.US);
         }
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index a0b7ebf43..7b34c18e1 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -184,6 +184,7 @@ public class mcMMO extends JavaPlugin {
     @Override
     public void onEnable() {
         try {
+            setupFilePaths();
             generalConfig = new GeneralConfig(getDataFolder()); //Load before skillTools
             skillTools = new SkillTools(this); //Load after general config
 
@@ -207,7 +208,6 @@ public class mcMMO extends JavaPlugin {
 
             upgradeManager = new UpgradeManager();
 
-            setupFilePaths();
 
             modManager = new ModManager();
 
@@ -338,7 +338,6 @@ public class mcMMO extends JavaPlugin {
 
         transientEntityTracker = new TransientEntityTracker();
         setServerShutdown(false); //Reset flag, used to make decisions about async saves
-        LocaleLoader.reloadLocale(); //Apply override locale
     }
 
     public static PlayerLevelUtils getPlayerLevelUtils() {