From f498391c1fb073a1ea8b09aff07c9fed9e397092 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 18 Feb 2024 21:06:02 +0800 Subject: [PATCH] Replace $/{ in shop placeholders --- main/src/main/java/net/citizensnpcs/trait/ShopTrait.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java index 6ab3c990c..6d664746e 100644 --- a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java @@ -446,8 +446,11 @@ public class ShopTrait extends Trait { StringBuffer sb = new StringBuffer(); Matcher matcher = PLACEHOLDER_REGEX.matcher(string); while (matcher.find()) { - matcher.appendReplacement(sb, Joiner.on(", ").join( - Iterables.transform(matcher.group(1).equals("cost") ? cost : result, NPCShopAction::describe))); + matcher.appendReplacement(sb, + Joiner.on(", ") + .join(Iterables.transform(matcher.group(1).equalsIgnoreCase("cost") ? cost : result, + NPCShopAction::describe)) + .replace("$", "\\$").replace("{", "\\{")); } matcher.appendTail(sb); return sb.toString();