From c3681e0e57879ead223a0cd660f6ba8036444881 Mon Sep 17 00:00:00 2001 From: StarWishsama Date: Sun, 17 Nov 2024 14:58:06 +0800 Subject: [PATCH 1/2] chore: fix typo --- .../io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java index 3681704966..db04ab83b1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java @@ -28,9 +28,9 @@ public final class ChargeUtils { private static final String LORE_PREFIX = ChatColors.color("&8\u21E8 &e\u26A1 &7"); - private static final String NUMBER_PREFIX = "([+-]?[\\d]+([\\.][\\d]+)?([Ee][+-]?[\\d]+)?)"; + private static final String NUMBER_REGEX = "([+-]?[\\d]+([\\.][\\d]+)?([Ee][+-]?[\\d]+)?)"; private static final Pattern REGEX = - Pattern.compile(ChatColors.color("(&c&o)?" + LORE_PREFIX) + NUMBER_PREFIX + " / " + NUMBER_PREFIX + " J"); + Pattern.compile(ChatColors.color("(&c&o)?" + LORE_PREFIX) + NUMBER_REGEX + " / " + NUMBER_REGEX + " J"); private ChargeUtils() {} From b963bafa7f5aba912bdc002e259aa40f1281f91e Mon Sep 17 00:00:00 2001 From: StarWishsama Date: Sun, 17 Nov 2024 15:02:58 +0800 Subject: [PATCH 2/2] fix(sfis): cherry pick fix from upstream c84e87627d --- .../thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java index e6df6506c9..6533ae5467 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItemStack.java @@ -319,7 +319,7 @@ public void lock() { @Override public ItemStack clone() { - return new SlimefunItemStack(id, this); + return new SlimefunItemStack(id, super.clone()); } @Override