From 0bb8a11cd94a4f9884f54fc8ec1c1ab5cbaaa848 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 2 Feb 2020 20:20:57 +0100 Subject: [PATCH] Fixes #1435 --- CHANGELOG.md | 2 ++ .../core/services/localization/SlimefunLocalization.java | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fcb4829a..335e13210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,8 @@ * Fixed Backpacks being placeable * Fixed wrong file encoding for translations * Fixed Minecraft recipes not showing correctly +* Fixed #1428 +* Fixed #1435 ## Release Candidate 4 (06 Jan 2020) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4 diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/SlimefunLocalization.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/SlimefunLocalization.java index 56165b03c..eec4c9110 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/SlimefunLocalization.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/localization/SlimefunLocalization.java @@ -39,6 +39,7 @@ public abstract class SlimefunLocalization extends Localization implements Keyed public String getResearchName(Player p, NamespacedKey key) { Language language = getLanguage(p); + if (language == null || language.getResearches() == null) return null; return language.getResearches().getString(key.getNamespace() + "." + key.getKey()); }