Parse /pay modifiers more strictly (#5638)

Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
EssentialsX · Nov 25, 2024 · 3203e97 · 3203e97
1 parent bea43e8
commit 3203e97
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 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
@@ -46,25 +46,28 @@ public void run(final Server server, final User user, final String commandLabel,
         }
 
         BigDecimal tempAmount = new BigDecimal(sanitizedString);
-        switch (Character.toLowerCase(ogStr.charAt(ogStr.length() - 1))) {
-            case 'k': {
+        switch (ogStr.replace(sanitizedString, "")) {
+            case "": {
+                break;
+            }
+            case "k": {
                 tempAmount = tempAmount.multiply(THOUSAND);
                 break;
             }
-            case 'm': {
+            case "m": {
                 tempAmount = tempAmount.multiply(MILLION);
                 break;
             }
-            case 'b': {
+            case "b": {
                 tempAmount = tempAmount.multiply(BILLION);
                 break;
             }
-            case 't': {
+            case "t": {
                 tempAmount = tempAmount.multiply(TRILLION);
                 break;
             }
             default: {
-                break;
+                throw new InvalidModifierException();
             }
         }
 

diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/InvalidModifierException.java b/Essentials/src/main/java/com/earth2me/essentials/commands/InvalidModifierException.java
@@ -0,0 +1,9 @@
+package com.earth2me.essentials.commands;
+
+import net.ess3.api.TranslatableException;
+
+public class InvalidModifierException extends TranslatableException {
+    public InvalidModifierException() {
+        super("invalidModifier");
+    }
+}
diff --git a/Essentials/src/main/resources/messages.properties b/Essentials/src/main/resources/messages.properties
@@ -550,6 +550,7 @@ invalidHome=<dark_red>Home<secondary> {0} <dark_red>doesn''t exist\!
 invalidHomeName=<dark_red>Invalid home name\!
 invalidItemFlagMeta=<dark_red>Invalid itemflag meta\: <secondary>{0}<dark_red>.
 invalidMob=<dark_red>Invalid mob type.
+invalidModifier=<dark_red>Invalid Modifier.
 invalidNumber=Invalid Number.
 invalidPotion=<dark_red>Invalid Potion.
 invalidPotionMeta=<dark_red>Invalid potion meta\: <secondary>{0}<dark_red>.