From 3e59404e86048c2f1c2deed825aadc261bd63c15 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Wed, 17 Oct 2018 11:49:40 +0100
Subject: Fix argument processing

---
 spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java | 6 +++---
 .../src/main/java/me/lucko/spark/common/command/Arguments.java      | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'spark-common/src/main/java/me/lucko/spark')

diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
index 1de0ec9..fdf7b49 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
@@ -84,13 +84,13 @@ public abstract class SparkPlatform<S> {
             return;
         }
 
-        Arguments arguments = new Arguments(args);
-        String alias = arguments.raw().remove(0).toLowerCase();
+        ArrayList<String> rawArgs = new ArrayList<>(Arrays.asList(args));
+        String alias = rawArgs.remove(0).toLowerCase();
 
         for (Command<S> command : this.commands) {
             if (command.aliases().contains(alias)) {
                 try {
-                    command.executor().execute(this, sender, arguments);
+                    command.executor().execute(this, sender, new Arguments(rawArgs));
                 } catch (IllegalArgumentException e) {
                     sendMessage(sender, "&c" + e.getMessage());
                 }
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/Arguments.java b/spark-common/src/main/java/me/lucko/spark/common/command/Arguments.java
index 4189174..d240554 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/Arguments.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/Arguments.java
@@ -24,7 +24,6 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -37,8 +36,8 @@ public class Arguments {
     private final List<String> rawArgs;
     private final SetMultimap<String, String> parsedArgs;
 
-    public Arguments(String[] args) {
-        this.rawArgs = new ArrayList<>(Arrays.asList(args));
+    public Arguments(List<String> rawArgs) {
+        this.rawArgs = rawArgs;
         this.parsedArgs = HashMultimap.create();
 
         String flag = null;
-- 
cgit