Use better amount format pattern

EssentialsX · Sep 12, 2023 · 27e2b5e · 27e2b5e
1 parent 87a75c4
commit 27e2b5e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpay.java
@@ -20,7 +20,7 @@
 import static com.earth2me.essentials.I18n.tl;
 
 public class Commandpay extends EssentialsLoopCommand {
-    private static final Pattern NUMBER_FORMAT = Pattern.compile("([0-9][0-9_'`,]*(?:\\.[0-9]+)?|\\.[0-9]+)([kmbt])?");
+    private static final Pattern AMOUNT_FORMAT = Pattern.compile("((?:[0-9][_'`,]?)+(?:\\.[0-9]+)?|\\.[0-9]+)([kmbt])?");
     private static final Pattern SANITIZE = Pattern.compile("[^0-9.]");
 
     private static final BigDecimal THOUSAND = new BigDecimal(1000);
@@ -43,7 +43,7 @@ public void run(final Server server, final User user, final String commandLabel,
             throw new Exception(tl("payMustBePositive"));
         }
 
-        final Matcher formatMatcher = NUMBER_FORMAT.matcher(amountStr);
+        final Matcher formatMatcher = AMOUNT_FORMAT.matcher(amountStr);
         if (!formatMatcher.matches()) {
             throw new Exception(tl("numberRequired"));
         }