From 5fe9d05e1b29ef292687f752520b7a615808037d Mon Sep 17 00:00:00 2001
From: Magnus Ulf <magnus@muj.dk>
Date: Tue, 5 Feb 2019 13:58:44 +0100
Subject: [PATCH] Small DB changes

---
 .../massivecore/store/DriverFlatfile.java      | 18 ++++++++++++------
 .../massivecraft/massivecore/util/IdData.java  |  2 --
 .../massivecraft/massivecore/util/IdUtil.java  |  7 ++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/com/massivecraft/massivecore/store/DriverFlatfile.java b/src/com/massivecraft/massivecore/store/DriverFlatfile.java
index 959da459..9bd1dc30 100644
--- a/src/com/massivecraft/massivecore/store/DriverFlatfile.java
+++ b/src/com/massivecraft/massivecore/store/DriverFlatfile.java
@@ -1,5 +1,6 @@
 package com.massivecraft.massivecore.store;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.massivecraft.massivecore.collections.MassiveMap;
@@ -148,23 +149,28 @@ public class DriverFlatfile extends DriverAbstract
 		return loadFile(file);
 	}
 	
-	public Entry<JsonObject, Long> loadFile(File file)
+	public static Entry<JsonObject, Long> loadFile(File file)
 	{
 		long mtime = file.lastModified();
-		JsonObject raw = loadFileJson(file);
+		JsonObject raw = loadFileJsonObject(file);
 		
 		return new SimpleEntry<>(raw, mtime);
 	}
 	
-	public JsonObject loadFileJson(File file)
+	public static JsonObject loadFileJsonObject(File file)
+	{
+		return loadFileJson(file).getAsJsonObject();
+	}
+
+	public static JsonElement loadFileJson(File file)
 	{
 		String content = DiscUtil.readCatch(file);
 		if (content == null) return null;
-		
+
 		content = content.trim();
 		if (content.length() == 0) return null;
-		
-		return new JsonParser().parse(content).getAsJsonObject();
+
+		return new JsonParser().parse(content);
 	}
 	
 	@Override
diff --git a/src/com/massivecraft/massivecore/util/IdData.java b/src/com/massivecraft/massivecore/util/IdData.java
index 5141ef32..fcfd29c8 100644
--- a/src/com/massivecraft/massivecore/util/IdData.java
+++ b/src/com/massivecraft/massivecore/util/IdData.java
@@ -63,8 +63,6 @@ public class IdData implements Identified, Named
 	@Override
 	public boolean equals(Object obj)
 	{
-		if (this == obj) return true;
-		if (obj == null) return false;
 		if (!(obj instanceof IdData)) return false;
 		IdData other = (IdData) obj;
 		if (id == null)
diff --git a/src/com/massivecraft/massivecore/util/IdUtil.java b/src/com/massivecraft/massivecore/util/IdUtil.java
index 69965c92..a8aa6611 100644
--- a/src/com/massivecraft/massivecore/util/IdUtil.java
+++ b/src/com/massivecraft/massivecore/util/IdUtil.java
@@ -264,7 +264,12 @@ public class IdUtil implements Listener, Runnable
 	{
 		update(id, name, System.currentTimeMillis(), presence);
 	}
-	
+
+	public static void update(IdData data)
+	{
+		update(data.getId(), data.getName(), data.getMillis(), null);
+	}
+
 	public static void update(final String id, final String name, final long millis, SenderPresence presence)
 	{
 		// First Null Check