From 33b9841182c0c0548343d5d01d7c9fe736e8a1e4 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Mon, 25 Jul 2022 17:57:46 +0200 Subject: [PATCH] Fixed an issue with PAPI math expansion in GUIs --- .../java/net/Indyuce/mmocore/gui/api/item/Placeholders.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java b/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java index e6572908..48bc03ba 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java +++ b/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java @@ -2,6 +2,7 @@ package net.Indyuce.mmocore.gui.api.item; import net.Indyuce.mmocore.MMOCore; import org.bukkit.entity.Player; +import org.jetbrains.annotations.Nullable; import java.util.HashMap; import java.util.Map; @@ -21,7 +22,9 @@ public class Placeholders { // Internal placeholders while (str.contains("{") && str.substring(str.indexOf("{")).contains("}")) { String holder = str.substring(str.indexOf("{") + 1, str.indexOf("}")); - str = str.replace("{" + holder + "}", placeholders.getOrDefault(holder, "Error")); + @Nullable String found = placeholders.get(holder); + if (found != null) + str = str.replace("{" + holder + "}", found); } // External placeholders