Update ChargeUtils.java

mcchampions · Nov 16, 2024 · 080e06f · 080e06f
1 parent d157883
commit 080e06f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java
@@ -31,7 +31,7 @@ public final class ChargeUtils {
     private static final String LORE_PREFIX = "§8\u21E8 §e\u26A1 §7";
     private static final String NUMBER_PREFIX = "([+-]?\\d+([.]\\d+)?([Ee][+-]?\\d+)?)";
     private static final Pattern REGEX =
-            Pattern.compile(LORE_PREFIX + NUMBER_PREFIX + " / " + NUMBER_PREFIX + " J", Pattern.CASE_INSENSITIVE);
+            Pattern.compile("(§c§o)?"  + LORE_PREFIX + NUMBER_PREFIX + " / " + NUMBER_PREFIX + " J", Pattern.CASE_INSENSITIVE);
 
 
     private static final Pattern REGEX_NEW =
@@ -111,6 +111,10 @@ public static float getCharge(ItemMeta meta) {
                 if (matcher.matches()) {
                     String data = matcher.group(2);
 
+                    if (data == null) {
+                        return 0;
+                    }
+
                     float loreValue = Float.parseFloat(data);
                     container.set(key, PersistentDataType.FLOAT, loreValue);
                     return loreValue;