Merge from upstream

mcchampions · Nov 18, 2024 · 89ef41c · 89ef41c
2 parents 279eb64 + b963baf
commit 89ef41c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
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
@@ -284,7 +284,7 @@ private static String getTexture(String id, String texture) {
 
     @Override
     public ItemStack clone() {
-        return new SlimefunItemStack(id, this);
+        return new SlimefunItemStack(id, super.clone());
     }
 
     @Override

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java
@@ -32,7 +32,6 @@ public final class ChargeUtils {
     private static final Pattern REGEX =
             Pattern.compile("(§c§o)?" + LORE_PREFIX + NUMBER_REGEX + " / " + NUMBER_REGEX + " J", Pattern.CASE_INSENSITIVE);
 
-
     private static final Pattern REGEX_NEW =
             Pattern.compile(NUMBER_REGEX + " / " + NUMBER_REGEX + " J");