mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-11-14 14:45:27 +01:00
Check for the specific modifier instead of last char in string
This commit is contained in:
parent
3b61b3ed31
commit
edfba6ff44
@ -47,25 +47,28 @@ public class Commandpay extends EssentialsLoopCommand {
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,9 @@
|
||||
package com.earth2me.essentials.commands;
|
||||
|
||||
import net.ess3.api.TranslatableException;
|
||||
|
||||
public class InvalidModifierException extends TranslatableException {
|
||||
public InvalidModifierException() {
|
||||
super("invalidModifier");
|
||||
}
|
||||
}
|
@ -548,6 +548,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>.
|
||||
|
Loading…
Reference in New Issue
Block a user