EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

More proper fix

Browse Source
This commit is contained in:
nossr50 2021-04-16 12:24:02 -07:00
parent 81a3441d62
commit c29f311f1e
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -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 Version 2.1.193
Fixed another bug where mcrank/mctop/leaderboards weren't loading 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) Fixed a bug where override locales weren't being loaded (but worked after a reloadlocale command)

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.1.193</version> <version>2.1.194-SNAPSHOT</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm> <scm>

1
src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
View File

@ -152,6 +152,7 @@ public final class LocaleLoader {
mcMMO.p.getLogger().log(Level.WARNING, "Failed to load locale from " + localePath, e); mcMMO.p.getLogger().log(Level.WARNING, "Failed to load locale from " + localePath, e);
} }
} }
bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale); bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale);
enBundle = ResourceBundle.getBundle(BUNDLE_ROOT, Locale.US); enBundle = ResourceBundle.getBundle(BUNDLE_ROOT, Locale.US);
} }

3
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -184,6 +184,7 @@ public class mcMMO extends JavaPlugin {
@Override @Override
public void onEnable() { public void onEnable() {
try { try {
setupFilePaths();
generalConfig = new GeneralConfig(getDataFolder()); //Load before skillTools generalConfig = new GeneralConfig(getDataFolder()); //Load before skillTools
skillTools = new SkillTools(this); //Load after general config skillTools = new SkillTools(this); //Load after general config
@ -207,7 +208,6 @@ public class mcMMO extends JavaPlugin {
upgradeManager = new UpgradeManager(); upgradeManager = new UpgradeManager();
setupFilePaths();
modManager = new ModManager(); modManager = new ModManager();
@ -338,7 +338,6 @@ public class mcMMO extends JavaPlugin {
transientEntityTracker = new TransientEntityTracker(); transientEntityTracker = new TransientEntityTracker();
setServerShutdown(false); //Reset flag, used to make decisions about async saves setServerShutdown(false); //Reset flag, used to make decisions about async saves
LocaleLoader.reloadLocale(); //Apply override locale
} }
public static PlayerLevelUtils getPlayerLevelUtils() { public static PlayerLevelUtils getPlayerLevelUtils() {