From 7c4868cada6d133ad3e25ca2191bea0efd6ba49d Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Tue, 1 Sep 2020 18:29:53 -0400
Subject: [PATCH] LocaleUtils: don't NPE if no default locale mapping exists
 (#1239)

---
 .../main/java/org/geysermc/connector/utils/LocaleUtils.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java b/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
index c09af2b7d..07c33eb1a 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
@@ -246,6 +246,11 @@ public class LocaleUtils {
         Map<String, String> localeStrings = LocaleUtils.LOCALE_MAPPINGS.get(locale.toLowerCase());
         if (localeStrings == null)
             localeStrings = LocaleUtils.LOCALE_MAPPINGS.get(LanguageUtils.getDefaultLocale());
+        if (localeStrings == null) {
+            // Don't cause a NPE if the locale is STILL missing
+            GeyserConnector.getInstance().getLogger().debug("MISSING DEFAULT LOCALE: " + LanguageUtils.getDefaultLocale());
+            return messageText;
+        }
 
         return localeStrings.getOrDefault(messageText, messageText);
     }