From 27e2b5e54c42fb2678d15f10800078d4d3025ffc Mon Sep 17 00:00:00 2001 From: Daniil Z Date: Wed, 13 Sep 2023 01:01:25 +0300 Subject: [PATCH] Use better amount format pattern --- .../java/com/earth2me/essentials/commands/Commandpay.java | 4 ++-- 1 file changed, 2 insertions(+), 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 index 5507950d5d6..339dac8d4bb 100644 --- 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")); }