Prevent some possible NPEs

TownyAdvanced · Aug 25, 2021 · aa4779b · aa4779b
1 parent 47d42dd
commit aa4779b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/com/palmergames/bukkit/towny/object/Translation.java b/src/com/palmergames/bukkit/towny/object/Translation.java
@@ -88,8 +88,10 @@ public static void loadTranslationRegistry() {
 		if (addedTranslations != null && !addedTranslations.isEmpty()) {
 			for (String lang : addedTranslations.keySet())
 				if (addedTranslations.get(lang) != null && !addedTranslations.get(lang).isEmpty())
-					for (Map.Entry<String, String> entry : addedTranslations.get(lang).entrySet())
+					for (Map.Entry<String, String> entry : addedTranslations.get(lang).entrySet()) {
+						translations.computeIfAbsent(lang, k -> new HashMap<>());
 						translations.get(lang).put(entry.getKey().toLowerCase(Locale.ROOT), entry.getValue());
+					}
 		}
 
 		// Load optional override files.
@@ -101,9 +103,11 @@ public static void loadTranslationRegistry() {
 						Map<String, Object> values = new Yaml(new SafeConstructor()).load(is);
 						String lang = FileNameUtils.getBaseName(file.getName());
 
-						if (values != null)
+						if (values != null) {
+							translations.computeIfAbsent(lang, k -> new HashMap<>());
 							for (Map.Entry<String, Object> entry : values.entrySet())
 								translations.get(lang).put(entry.getKey().toLowerCase(Locale.ROOT), String.valueOf(entry.getValue()));
+						}
 					} catch (Exception e) {
 						e.printStackTrace();
 					}