From 908db88dae5a91e611ff6b1353064ba46bac226c Mon Sep 17 00:00:00 2001 From: Indyuce Date: Thu, 18 Aug 2022 13:26:35 +0200 Subject: [PATCH] Removed PHE again --- .../net/Indyuce/mmocore/gui/api/item/Placeholders.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java index 9be73a67..7ea643bd 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java @@ -23,11 +23,15 @@ public class Placeholders { while (str.contains("{") && str.substring(str.indexOf("{")).contains("}")) { String holder = str.substring(str.indexOf("{") + 1, str.indexOf("}")); @Nullable String found = placeholders.get(holder); + + /* + * Do NOT replace the placeholder unless a corresponding value has + * been found. This simple workaround fixes an issue with PAPI + * math expansions which interferes with MMOCore placeholders since + * it uses {....} as well. + */ if (found != null) str = str.replace("{" + holder + "}", found); - else - str = str.replace("{" + holder + "}", "PHE"); - } // External placeholders