From ce9933c1b314dbce1fd328888e01c4c34ba025e3 Mon Sep 17 00:00:00 2001
From: chickeneer <emcchickeneer@gmail.com>
Date: Sat, 6 Nov 2021 22:07:58 -0500
Subject: [PATCH] Revert "Improve setting the default locale of the
 localemanager"

This reverts commit 01796e7ac470a468d66e00081b5bd8fca6391c71.

Attempted fix was misguided
---
 core/src/main/java/co/aikar/commands/Locales.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/co/aikar/commands/Locales.java b/core/src/main/java/co/aikar/commands/Locales.java
index eb35145c..e655982d 100644
--- a/core/src/main/java/co/aikar/commands/Locales.java
+++ b/core/src/main/java/co/aikar/commands/Locales.java
@@ -85,7 +85,7 @@ public class Locales {
 
     public Locales(CommandManager manager) {
         this.manager = manager;
-        this.localeManager = LocaleManager.create(manager::getIssuerLocale, manager.getLocales().getDefaultLocale());
+        this.localeManager = LocaleManager.create(manager::getIssuerLocale);
         this.addBundleClassLoader(this.getClass().getClassLoader());
     }
 
@@ -108,7 +108,7 @@ public class Locales {
         //noinspection unchecked
         Set<Locale> supportedLanguages = manager.getSupportedLanguages();
         for (Locale locale : supportedLanguages) {
-            for (SetMultimap<String, Locale> localeData : this.loadedBundles.values()) {
+            for(SetMultimap<String, Locale> localeData: this.loadedBundles.values()) {
                 for (String bundleName : new HashSet<>(localeData.keys())) {
                     addMessageBundle(bundleName, locale);
                 }
@@ -129,8 +129,8 @@ public class Locales {
 
     public boolean addMessageBundle(String bundleName, Locale locale) {
         boolean found = false;
-        for (ClassLoader classLoader : this.registeredClassLoaders) {
-            if (this.addMessageBundle(classLoader, bundleName, locale)) {
+        for(ClassLoader classLoader: this.registeredClassLoaders) {
+            if(this.addMessageBundle(classLoader, bundleName, locale)) {
                 found = true;
             }
         }
@@ -140,8 +140,8 @@ public class Locales {
 
     public boolean addMessageBundle(ClassLoader classLoader, String bundleName, Locale locale) {
         SetMultimap<String, Locale> classLoadersLocales = this.loadedBundles.getOrDefault(classLoader, HashMultimap.create());
-        if (!classLoadersLocales.containsEntry(bundleName, locale)) {
-            if (this.localeManager.addMessageBundle(classLoader, bundleName, locale)) {
+        if(!classLoadersLocales.containsEntry(bundleName, locale)) {
+            if(this.localeManager.addMessageBundle(classLoader, bundleName, locale)) {
                 classLoadersLocales.put(bundleName, locale);
                 this.loadedBundles.put(classLoader, classLoadersLocales);
                 return true;