From 0956d5fe38f7dc9e260c7cc6079479c658c27d65 Mon Sep 17 00:00:00 2001 From: Holly P <25277367+Thatsmusic99@users.noreply.github.com> Date: Tue, 25 Jul 2023 13:10:59 +0100 Subject: [PATCH] fix: item payments being parsed incorrectly --- .../advancedteleport/payments/PaymentManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java index 9131562a..2586f587 100644 --- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java +++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java @@ -67,10 +67,10 @@ private void addCommand(String command, Object value) { private Payment parsePayment(String rawPayment) { if (rawPayment.length() - 3 <= 0) { - Matcher matcher = Pattern.compile("^(.+:)?([0-9]+(\\.[0-9]+)?)").matcher(rawPayment); + Matcher matcher = Pattern.compile("^((.+):)?([0-9]+(\\.[0-9]+)?)").matcher(rawPayment); if (matcher.matches()) { - String plugin = matcher.group(1); - double payment = Double.parseDouble(matcher.group(2)); + String plugin = matcher.group(2); + double payment = Double.parseDouble(matcher.group(3)); CoreClass.debug("Split payment into two, part 1: " + plugin + ", part two: " + payment); CoreClass.debug("Material: " + Material.getMaterial(plugin == null ? "" : plugin)); @@ -90,10 +90,10 @@ private Payment parsePayment(String rawPayment) { } else if (rawPayment.endsWith("EXP")) { return new PointsPayment(Integer.parseInt(points)); } else { - Matcher matcher = Pattern.compile("^(.+:)?([0-9]+(\\.[0-9]+)?)").matcher(rawPayment); + Matcher matcher = Pattern.compile("^((.+):)?([0-9]+(\\.[0-9]+)?)").matcher(rawPayment); if (matcher.matches()) { - String plugin = matcher.group(1); - double payment = Double.parseDouble(matcher.group(2)); + String plugin = matcher.group(2); + double payment = Double.parseDouble(matcher.group(3)); CoreClass.debug("Split payment into two, part 1: " + plugin + ", part two: " + payment); CoreClass.debug("Material: " + Material.getMaterial(plugin == null ? "" : plugin));