From dd3724e663bc90c311bf4e459a37ead535d39f37 Mon Sep 17 00:00:00 2001
From: Magnus Ulf <magnus@muj.dk>
Date: Sun, 27 Jan 2019 16:42:09 +0100
Subject: [PATCH] Small database changes

---
 .../massivecore/command/MassiveCommand.java         |  5 +++++
 src/com/massivecraft/massivecore/store/Entity.java  | 13 +------------
 .../massivecore/store/EntityInternal.java           | 11 ++++++++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/com/massivecraft/massivecore/command/MassiveCommand.java b/src/com/massivecraft/massivecore/command/MassiveCommand.java
index e553aa1b..7589e138 100644
--- a/src/com/massivecraft/massivecore/command/MassiveCommand.java
+++ b/src/com/massivecraft/massivecore/command/MassiveCommand.java
@@ -1295,6 +1295,11 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 		return ret;
 	}
 
+	public Mson getTemplateWithArgs(CommandSender sender, String... args)
+	{
+		return this.getTemplateWithArgs(sender, MUtil.list(args));
+	}
+
 	public Mson getTemplateWithArgs(CommandSender sender, List<String> args)
 	{
 		Mson ret = this.getTemplateChain(true, sender);
diff --git a/src/com/massivecraft/massivecore/store/Entity.java b/src/com/massivecraft/massivecore/store/Entity.java
index f990e5b3..f2cfb222 100644
--- a/src/com/massivecraft/massivecore/store/Entity.java
+++ b/src/com/massivecraft/massivecore/store/Entity.java
@@ -48,27 +48,16 @@ public class Entity<E extends Entity<E>> extends EntityInternal<E>
 		this.lastStackTraceChanged = null;
 	}
 
-
-	
 	// -------------------------------------------- //
 	// ATTACH AND DETACH
 	// -------------------------------------------- //
-	
+
 	@SuppressWarnings("unchecked")
 	public String attach(EntityContainer<E> container)
 	{
 		if (!(container instanceof Coll)) throw new IllegalArgumentException(container.getClass().getName() + " is not a Coll.");
 		return container.attach((E) this);
 	}
-	
-	@SuppressWarnings("unchecked")
-	public E detach()
-	{
-		EntityContainer<E> coll = this.getContainer();
-		if (coll == null) return (E)this;
-		
-		return coll.detachEntity((E) this);
-	}
 
 	// -------------------------------------------- //
 	// SYNC AND IO ACTIONS
diff --git a/src/com/massivecraft/massivecore/store/EntityInternal.java b/src/com/massivecraft/massivecore/store/EntityInternal.java
index fba0a7d9..f9a4004e 100644
--- a/src/com/massivecraft/massivecore/store/EntityInternal.java
+++ b/src/com/massivecraft/massivecore/store/EntityInternal.java
@@ -73,7 +73,16 @@ public class EntityInternal<E extends EntityInternal<E>> implements Identified
 	{
 		
 	}
-	
+
+	@SuppressWarnings("unchecked")
+	public E detach()
+	{
+		EntityContainer<E> coll = this.getContainer();
+		if (coll == null) return (E)this;
+
+		return coll.detachEntity((E) this);
+	}
+
 	// -------------------------------------------- //
 	// SYNC AND IO ACTIONS
 	// -------------------------------------------- //