From 469cf9ea249c02a8ec99b88f96a86fac2847c641 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Wed, 22 Apr 2015 11:21:05 +0200
Subject: [PATCH] NaturalOrderComparator Null Compare. More Constructors for
 WorldExceptionSet.

---
 .../massivecore/NaturalOrderComparator.java        |  5 +++++
 .../massivecore/collections/WorldExceptionSet.java | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/com/massivecraft/massivecore/NaturalOrderComparator.java b/src/com/massivecraft/massivecore/NaturalOrderComparator.java
index df27aae0..466b3ea4 100644
--- a/src/com/massivecraft/massivecore/NaturalOrderComparator.java
+++ b/src/com/massivecraft/massivecore/NaturalOrderComparator.java
@@ -47,6 +47,11 @@ public class NaturalOrderComparator implements Comparator<Object>
 	@Override
 	public int compare(Object o1, Object o2)
 	{
+		// Null (MassiveCore Modification)
+		if (o1 == null && o2 == null) return 0;
+		if (o2 == null) return 1;
+		if (o1 == null) return -1;
+		
 		String a = o1.toString();
 		String b = o2.toString();
 
diff --git a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java b/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
index 61a4abbf..7e3dd86b 100644
--- a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
+++ b/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
@@ -15,6 +15,20 @@ public class WorldExceptionSet
 	
 	public MassiveTreeSet<String, CaseInsensitiveComparator> exceptions = new MassiveTreeSet<String, CaseInsensitiveComparator>(CaseInsensitiveComparator.get());
 	
+	// -------------------------------------------- //
+	// CONSTRUCT
+	// -------------------------------------------- //
+	
+	public WorldExceptionSet()
+	{
+		
+	}
+	
+	public WorldExceptionSet(boolean standard)
+	{
+		this.standard = standard;
+	}
+	
 	// -------------------------------------------- //
 	// CONTAINS
 	// -------------------------------------------- //