diff --git a/Server/build.gradle b/Server/build.gradle index cc0a72780..07adf3761 100644 --- a/Server/build.gradle +++ b/Server/build.gradle @@ -22,7 +22,7 @@ repositories { dependencies { implementation("com.github.ajalt.mordant:mordant:2.0.0-alpha2") - implementation "org.jetbrains:markdown-jvm:0.2.0" + implementation "org.jetbrains:markdown-jvm:0.2.4" implementation 'com.google.guava:guava:29.0-jre' implementation 'mysql:mysql-connector-java:8.0.21' implementation 'io.github.classgraph:classgraph:4.8.98' diff --git a/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java b/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java index e5714afd8..8ffe33bdf 100644 --- a/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java @@ -343,6 +343,8 @@ public class GrandExchangeInterface extends ComponentPlugin { String s = value.toString(); s = s.replace("k","000"); s = s.replace("K","000"); + s = s.replace("m","000000"); + s = s.replace("M","000000"); setOfferAmount(player, offer, Integer.parseInt(s)); return Unit.INSTANCE; }); @@ -379,6 +381,8 @@ public class GrandExchangeInterface extends ComponentPlugin { String s = value.toString(); s = s.replace("k","000"); s = s.replace("K","000"); + s = s.replace("m","000000"); + s = s.replace("M","000000"); setOfferValue(player, offer, Integer.parseInt(s)); return Unit.INSTANCE; }); diff --git a/Server/src/main/java/core/game/interaction/inter/TradeInterfacePlugin.java b/Server/src/main/java/core/game/interaction/inter/TradeInterfacePlugin.java index 4b1702fb1..88fb909be 100644 --- a/Server/src/main/java/core/game/interaction/inter/TradeInterfacePlugin.java +++ b/Server/src/main/java/core/game/interaction/inter/TradeInterfacePlugin.java @@ -72,6 +72,8 @@ public final class TradeInterfacePlugin extends ComponentPlugin { String s = value.toString(); s = s.replace("k","000"); s = s.replace("K","000"); + s = s.replace("m","000000"); + s = s.replace("M","000000"); int val = Integer.parseInt(s); module.getContainer().withdraw(slot, val); return Unit.INSTANCE; diff --git a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java index c841b6ffd..71e3914b5 100644 --- a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java @@ -376,6 +376,8 @@ public final class BankingPlugin extends OptionHandler { String s = value.toString(); s = s.replace("k","000"); s = s.replace("K","000"); + s = s.replace("m","000000"); + s = s.replace("M","000000"); int val = Integer.parseInt(s); p.getBank().takeItem(slot, val); p.getBank().updateLastAmountX(val);