From cf5751333e8057c018da6c1e7da45b4c5b4bf430 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Thu, 19 Sep 2013 16:20:17 +0200
Subject: [PATCH] Allow ArgReader to handle case where arg is null.

---
 src/com/massivecraft/mcore/cmd/MCommand.java | 22 +++++++++++++-------
 src/com/massivecraft/mcore/store/Coll.java   |  1 -
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/com/massivecraft/mcore/cmd/MCommand.java b/src/com/massivecraft/mcore/cmd/MCommand.java
index 5df689f3..6a26633e 100644
--- a/src/com/massivecraft/mcore/cmd/MCommand.java
+++ b/src/com/massivecraft/mcore/cmd/MCommand.java
@@ -514,7 +514,8 @@ public abstract class MCommand
 	
 	public <T> T arg(int idx, ArgReader<T> argReader)
 	{
-		return this.arg(idx, argReader, null);
+		String str = this.arg(idx);
+		return this.arg(str, argReader);
 	}
 	
 	public <T> T arg(int idx, ArgReader<T> argReader, T defaultNotSet)
@@ -536,7 +537,8 @@ public abstract class MCommand
 	
 	public <T> T argConcatFrom(int idx, ArgReader<T> argReader)
 	{
-		return this.argConcatFrom(idx, argReader, null);
+		String str = this.argConcatFrom(idx);
+		return this.arg(str, argReader);
 	}
 	
 	public <T> T argConcatFrom(int idx, ArgReader<T> argReader, T defaultNotSet)
@@ -547,18 +549,22 @@ public abstract class MCommand
 	
 	// Core & Other
 	
-	public <T> T arg(String str, ArgReader<T> argReader, T defaultNotSet)
+	public <T> T arg(ArgReader<T> argReader)
+	{
+		return this.arg(null, argReader);
+	}
+	
+	public <T> T arg(String str, ArgReader<T> argReader)
 	{
-		if (str == null) return defaultNotSet;
 		ArgResult<T> result = argReader.read(str, this.sender);
 		if (result.hasErrors()) this.msg(result.getErrors());
 		return result.getResult();
 	}
 	
-	public <T> T arg(ArgReader<T> argReader)
+	public <T> T arg(String str, ArgReader<T> argReader, T defaultNotSet)
 	{
-		ArgResult<T> result = argReader.read(null, this.sender);
-		if (result.hasErrors()) this.msg(result.getErrors());
-		return result.getResult();
+		if (str == null) return defaultNotSet;
+		return this.arg(str, argReader);
 	}
+	
 }
diff --git a/src/com/massivecraft/mcore/store/Coll.java b/src/com/massivecraft/mcore/store/Coll.java
index ba18cb29..e119b538 100644
--- a/src/com/massivecraft/mcore/store/Coll.java
+++ b/src/com/massivecraft/mcore/store/Coll.java
@@ -22,7 +22,6 @@ import com.massivecraft.mcore.util.Txt;
 import com.massivecraft.mcore.xlib.gson.Gson;
 import com.massivecraft.mcore.xlib.gson.JsonElement;
 import com.massivecraft.mcore.xlib.gson.JsonObject;
-import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
 
 public class Coll<E> implements CollInterface<E>
 {