Allow currency argument without world name in give/set/take commands.

TheNewEconomy · Aug 3, 2020 · c504a2b · c504a2b
1 parent eea88da
commit c504a2b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyGiveCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyGiveCommand.java
@@ -71,9 +71,21 @@ public boolean execute(CommandSender sender, String command, String[] arguments)
     Bukkit.getScheduler().runTaskAsynchronously(plugin, ()->{
       TNE.debug("===START MoneyGiveCommand ===");
       if(arguments.length >= 2) {
-        final String world = (arguments.length == 3) ? arguments[2] : WorldFinder.getWorld(sender, WorldVariant.BALANCE);
+        String world = (arguments.length >= 3) ? arguments[2] : WorldFinder.getWorld(sender, WorldVariant.BALANCE);
         String currencyName = (arguments.length >= 4) ? arguments[3] : TNE.manager().currencyManager().get(world).name();
 
+        if(arguments.length == 3 && !TNE.instance().hasWorldManager(world)) {
+          world = WorldFinder.getWorld(sender, WorldVariant.BALANCE);
+          currencyName = arguments[2];
+        }
+
+        if (!TNE.instance().hasWorldManager(world)) {
+          Message m = new Message("Messages.Money.NoWorld");
+          m.addVariable("$world", world);
+          m.translate(world, sender);
+          return;
+        }
+
         if(MISCUtils.isSingularPlayer(arguments[0]) && arguments.length < 4) {
           currencyName = MISCUtils.findCurrencyName(world, Bukkit.getPlayer(IDFinder.getID(arguments[0])).getLocation());
         }

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneySetCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneySetCommand.java
@@ -79,6 +79,18 @@ public boolean execute(CommandSender sender, String command, String[] arguments)
         String world = (arguments.length >= 3) ? arguments[2] : WorldFinder.getWorld(sender, WorldVariant.BALANCE);
         String currencyName = (arguments.length >= 4) ? arguments[3] : TNE.manager().currencyManager().get(world).name();
 
+        if(arguments.length == 3 && !TNE.instance().hasWorldManager(world)) {
+          world = WorldFinder.getWorld(sender, WorldVariant.BALANCE);
+          currencyName = arguments[2];
+        }
+
+        if (!TNE.instance().hasWorldManager(world)) {
+          Message m = new Message("Messages.Money.NoWorld");
+          m.addVariable("$world", world);
+          m.translate(world, sender);
+          return;
+        }
+
         if(MISCUtils.isSingularPlayer(arguments[0]) && arguments.length < 4) {
           currencyName = MISCUtils.findCurrencyName(world, Bukkit.getPlayer(IDFinder.getID(arguments[0])).getLocation());
         }

diff --git a/TNE/src/net/tnemc/core/commands/money/MoneyTakeCommand.java b/TNE/src/net/tnemc/core/commands/money/MoneyTakeCommand.java
@@ -70,9 +70,21 @@ public List<String> onTab(CommandSender sender, Command command, String alias, S
   public boolean execute(CommandSender sender, String command, String[] arguments) {
     Bukkit.getScheduler().runTaskAsynchronously(plugin, ()->{
       if(arguments.length >= 2) {
-        final String world = (arguments.length >= 3) ? arguments[2] : WorldFinder.getWorld(sender, WorldVariant.BALANCE);
+        String world = (arguments.length >= 3) ? arguments[2] : WorldFinder.getWorld(sender, WorldVariant.BALANCE);
         String currencyName = (arguments.length >= 4) ? arguments[3] : TNE.manager().currencyManager().get(world).name();
 
+        if(arguments.length == 3 && !TNE.instance().hasWorldManager(world)) {
+          world = WorldFinder.getWorld(sender, WorldVariant.BALANCE);
+          currencyName = arguments[2];
+        }
+
+        if (!TNE.instance().hasWorldManager(world)) {
+          Message m = new Message("Messages.Money.NoWorld");
+          m.addVariable("$world", world);
+          m.translate(world, sender);
+          return;
+        }
+
         if(MISCUtils.isSingularPlayer(arguments[0]) && arguments.length < 4) {
           currencyName = MISCUtils.findCurrencyName(world, Bukkit.getPlayer(IDFinder.getID(arguments[0])).getLocation());
         }