diff --git a/src/main/java/xyz/nifeather/morph/messages/MorphMessageStore.java b/src/main/java/xyz/nifeather/morph/messages/MorphMessageStore.java index 71508155..7832e27b 100644 --- a/src/main/java/xyz/nifeather/morph/messages/MorphMessageStore.java +++ b/src/main/java/xyz/nifeather/morph/messages/MorphMessageStore.java @@ -152,7 +152,12 @@ public String get(String key, @Nullable String defaultValue, @Nullable String lo for (var store : messageStores) { - var msg = store.get(key, null, null); + var msg = store.get(key, "NIL", null); + + // Since we use ConcurrentHashMap, we no longer can use NULL as the default value + // So this might be the only way. Solving this would require a PluginBase update. + if (msg.equals("NIL")) msg = null; + if (msg != null) return msg; }