Fixed null placeholder bug and improved config loading

2021-08-23 17:14:23 +01:00
parent 2c33ce25c0
commit db5b7f89f6
3 changed files with 3 additions and 13 deletions
--- a/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java
@@ -56,7 +56,7 @@ public class PlaceholderManager {
                                   @NotNull final String identifier) {
        Optional<PlaceholderEntry> matching = REGISTERED_PLACEHOLDERS.stream().filter(expansion -> expansion.getIdentifier().equalsIgnoreCase(identifier)).findFirst();
        if (matching.isEmpty()) {
-            return null;
+            return "";
        }
        PlaceholderEntry entry = matching.get();
        if (player == null && entry.requiresPlayer()) {