From 5984bc2774af61af2726c8ab07130c19c4281122 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Fri, 24 Apr 2015 01:06:57 +0200
Subject: [PATCH] Fix some generics. Avoid an NPE.

---
 .../massivecore/cmd/arg/ARList.java           | 30 +++++++++----------
 .../massivecore/cmd/arg/ARSet.java            | 30 +++++++++----------
 .../massivecraft/massivecore/util/MUtil.java  |  3 ++
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/com/massivecraft/massivecore/cmd/arg/ARList.java b/src/com/massivecraft/massivecore/cmd/arg/ARList.java
index 60cd6a54..f2445ca6 100644
--- a/src/com/massivecraft/massivecore/cmd/arg/ARList.java
+++ b/src/com/massivecraft/massivecore/cmd/arg/ARList.java
@@ -8,27 +8,27 @@ import org.bukkit.command.CommandSender;
 
 import com.massivecraft.massivecore.MassiveException;
 
-public class ARList<T> extends ARAbstract<List<T>>
+public class ARList<E> extends ARAbstract<List<E>>
 {
 	// -------------------------------------------- //
 	// FIELDS
 	// -------------------------------------------- //
 	
-	protected AR<T> innerArgReader;
-	public AR<T> getInnerArgReader() { return this.innerArgReader; }
+	protected AR<E> elementArgReader;
+	public AR<E> getElementArgReader() { return this.elementArgReader; }
 	
 	// -------------------------------------------- //
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	public static <T> ARList<T> get(AR<T> innerArgReader)
+	public static <E> ARList<E> get(AR<E> elementArgReader)
 	{
-		return new ARList<T>(innerArgReader);
+		return new ARList<E>(elementArgReader);
 	}
 	
-	public ARList(AR<T> innerArgReader)
+	public ARList(AR<E> elementArgReader)
 	{
-		this.innerArgReader = innerArgReader;
+		this.elementArgReader = elementArgReader;
 	}
 	
 	// -------------------------------------------- //
@@ -38,25 +38,25 @@ public class ARList<T> extends ARAbstract<List<T>>
 	@Override
 	public String getTypeName()
 	{
-		return innerArgReader.getTypeName();
+		return elementArgReader.getTypeName();
 	}
 
 	// NOTE: Must be used with argConcatFrom and setErrorOnTooManyArgs(false).
 	@Override
-	public List<T> read(String arg, CommandSender sender) throws MassiveException
+	public List<E> read(String arg, CommandSender sender) throws MassiveException
 	{
 		// Split into inner args
-		String[] innerArgs = arg.split("\\s+");
+		String[] elementArgs = arg.split("\\s+");
 		
 		// Create Ret
-		List<T> ret = new ArrayList<T>();
+		List<E> ret = new ArrayList<E>();
 		
 		// For Each
-		for (String innerArg : innerArgs)
+		for (String elementArg : elementArgs)
 		{
-			T innerArgResult = this.getInnerArgReader().read(innerArg, sender);
+			E element = this.getElementArgReader().read(elementArg, sender);
 			
-			ret.add(innerArgResult);
+			ret.add(element);
 		}
 		
 		// Return Ret
@@ -66,7 +66,7 @@ public class ARList<T> extends ARAbstract<List<T>>
 	@Override
 	public Collection<String> getTabList(CommandSender sender, String arg)
 	{
-		return this.getInnerArgReader().getTabList(sender, arg);
+		return this.getElementArgReader().getTabList(sender, arg);
 	}
 
 }
diff --git a/src/com/massivecraft/massivecore/cmd/arg/ARSet.java b/src/com/massivecraft/massivecore/cmd/arg/ARSet.java
index aa31cc50..9f429cd6 100644
--- a/src/com/massivecraft/massivecore/cmd/arg/ARSet.java
+++ b/src/com/massivecraft/massivecore/cmd/arg/ARSet.java
@@ -9,14 +9,14 @@ import org.bukkit.command.CommandSender;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.mixin.Mixin;
 
-public class ARSet<T> extends ARAbstract<Set<T>>
+public class ARSet<E> extends ARAbstract<Set<E>>
 {
 	// -------------------------------------------- //
 	// FIELDS
 	// -------------------------------------------- //
 	
-	private final AR<T> innerArgReader;
-	public AR<T> getInnerArgReader() { return this.innerArgReader; }
+	private final AR<E> elementArgReader;
+	public AR<E> getElementArgReader() { return this.elementArgReader; }
 	
 	private final boolean warnOnDuplicates;
 	public boolean getWarnOnDuplicate() { return warnOnDuplicates; }
@@ -25,14 +25,14 @@ public class ARSet<T> extends ARAbstract<Set<T>>
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	public static <T> ARSet<T> get(AR<T> innerArgReader, boolean warnOnDuplicates)
+	public static <E> ARSet<E> get(AR<E> elementArgReader, boolean warnOnDuplicates)
 	{
-		return new ARSet<T>(innerArgReader, warnOnDuplicates);
+		return new ARSet<E>(elementArgReader, warnOnDuplicates);
 	}
 	
-	public ARSet(AR<T> innerArgReader, boolean warnOnDuplicates)
+	public ARSet(AR<E> elementArgReader, boolean warnOnDuplicates)
 	{
-		this.innerArgReader = innerArgReader;
+		this.elementArgReader = elementArgReader;
 		this.warnOnDuplicates = warnOnDuplicates;
 	}
 	
@@ -43,27 +43,27 @@ public class ARSet<T> extends ARAbstract<Set<T>>
 	@Override
 	public String getTypeName()
 	{
-		return innerArgReader.getTypeName();
+		return elementArgReader.getTypeName();
 	}
 
 	// NOTE: Must be used with argConcatFrom and setErrorOnTooManyArgs(false).
 	@Override
-	public Set<T> read(String arg, CommandSender sender) throws MassiveException
+	public Set<E> read(String arg, CommandSender sender) throws MassiveException
 	{
 		// Split into inner args
-		String[] innerArgs = arg.split("\\s+");
+		String[] elementArgs = arg.split("\\s+");
 		
 		// Create Ret
-		Set<T> ret = new LinkedHashSet<T>();
+		Set<E> ret = new LinkedHashSet<E>();
 		
 		boolean duplicates = false;
 		
 		// For Each
-		for (String innerArg : innerArgs)
+		for (String elementArg : elementArgs)
 		{
-			T innerArgResult = this.getInnerArgReader().read(innerArg, sender);
+			E element = this.getElementArgReader().read(elementArg, sender);
 			
-			duplicates = ( ! ret.add(innerArgResult) || duplicates);
+			duplicates = ( ! ret.add(element) || duplicates);
 		}
 		
 		if (warnOnDuplicates && duplicates)
@@ -78,7 +78,7 @@ public class ARSet<T> extends ARAbstract<Set<T>>
 	@Override
 	public Collection<String> getTabList(CommandSender sender, String arg)
 	{
-		return innerArgReader.getTabList(sender, arg);
+		return elementArgReader.getTabList(sender, arg);
 	}
 
 }
diff --git a/src/com/massivecraft/massivecore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java
index 0ec8e74c..4884bada 100644
--- a/src/com/massivecraft/massivecore/util/MUtil.java
+++ b/src/com/massivecraft/massivecore/util/MUtil.java
@@ -1325,6 +1325,9 @@ public class MUtil
 		// Create Ret
 		List<E> ret = new MassiveList<E>();
 		
+		// Empty
+		if (list.isEmpty()) return ret;
+		
 		// Fill Ret
 		for (int i = 0; i < count; i++)
 		{