From 9c0d9afe19474cc799ba1065c35fed8c4599269d Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Mon, 23 Nov 2015 17:48:46 +0100
Subject: [PATCH] Check for entity attachment rather than entity having an id

---
 src/com/massivecraft/massivecore/store/Coll.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java
index 7c0df308..70d3e191 100644
--- a/src/com/massivecraft/massivecore/store/Coll.java
+++ b/src/com/massivecraft/massivecore/store/Coll.java
@@ -269,8 +269,7 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
 	{
 		// Check entity
 		if (entity == null) return null;
-		String previousEntityId = entity.getId();
-		if (previousEntityId != null) return previousEntityId;
+		if (entity.attached()) return entity.getId();
 		
 		String id;
 		// Check/Fix id