From 2e6463aed98ace4168e68f3992c0432ea64f6ac9 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 17 Jan 2022 11:15:18 +0000 Subject: [PATCH] Fixed global placeholders --- .../core/integrations/placeholder/PlaceholderManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git 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 index 53216d51..7c7bb7c3 100644 --- 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 @@ -78,6 +78,14 @@ public final class PlaceholderManager { EcoPlugin owner = player == null ? Eco.getHandler().getEcoPlugin() : plugin; PlaceholderEntry entry = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase()); + if (entry == null && plugin != null) { + PlaceholderEntry alternate = REGISTERED_PLACEHOLDERS.getOrDefault(Eco.getHandler().getEcoPlugin(), new HashMap<>()) + .get(identifier.toLowerCase()); + if (alternate != null) { + entry = alternate; + } + } + if (entry == null) { return ""; }