From 6e669d376f11458ad0f215d2689b1143020b95cb Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Thu, 18 Sep 2014 13:59:36 +0200
Subject: [PATCH] Even more broken database suggestions. Fixes Factions#685.

---
 .../massivecraft/massivecore/store/Coll.java  | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/massivecraft/massivecore/store/Coll.java b/src/main/java/com/massivecraft/massivecore/store/Coll.java
index c4366560..a4cd8656 100644
--- a/src/main/java/com/massivecraft/massivecore/store/Coll.java
+++ b/src/main/java/com/massivecraft/massivecore/store/Coll.java
@@ -556,19 +556,34 @@ public class Coll<E> implements CollInterface<E>
 		}
 		catch (Exception e)
 		{
-			MassiveCore.get().log(Txt.parse("<b>Database could not load entity. You edited a file manually and made wrong JSON?"));
-			MassiveCore.get().log(Txt.parse("<k>Error: <v>%s", e.getMessage()));
-			MassiveCore.get().log(Txt.parse("<k>Entity: <v>%s", id));
-			MassiveCore.get().log(Txt.parse("<k>Collection: <v>%s", this.getName()));
+			logLoadError(id, e.getMessage());
+			return;
+		}
+		
+		if (entry == null)
+		{
+			logLoadError(id, "MStore driver could not load data entry. The file might not be readable or simply not exist.");
 			return;
 		}
-		if (entry == null) return;
 		
 		JsonElement raw = entry.getKey();
-		if (raw == null) return;
+		if (raw == null)
+		{
+			logLoadError(id, "Raw data was null. Is the file completely empty?");
+			return;
+		}
+		if (raw.isJsonNull())
+		{
+			logLoadError(id, "Raw data was JSON null. It seems you have a file containing just the word \"null\". Why would you do this?");
+			return;
+		}
 		
 		Long mtime = entry.getValue();
-		if (mtime == null) return;
+		if (mtime == null)
+		{
+			logLoadError(id, "Last modification time (mtime) was null.");
+			return;
+		}
 		
 		// Calculate temp but handle raw cases.
 		E temp = null;
@@ -603,6 +618,14 @@ public class Coll<E> implements CollInterface<E>
 		this.lastDefault.remove(id);
 	}
 	
+	public void logLoadError(String entityId, String error)
+	{
+		MassiveCore.get().log(Txt.parse("<b>Database could not load entity. You edited a file manually and made wrong JSON?"));
+		MassiveCore.get().log(Txt.parse("<k>Entity: <v>%s", entityId));
+		MassiveCore.get().log(Txt.parse("<k>Collection: <v>%s", this.getName()));
+		MassiveCore.get().log(Txt.parse("<k>Error: <v>%s", error));
+	}
+	
 	// -------------------------------------------- //
 	// SYNC DECIDE AND BASIC DO
 	// -------------------------------------------- //