Browse Source

More proper fix

nossr50 4 years ago
parent
commit
c29f311f1e

+ 3 - 0
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)

+ 1 - 1
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>

+ 1 - 0
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);
         }

+ 1 - 2
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() {