From c23cbe44b923aa0acf84995c0a66b46f0e7e06d8 Mon Sep 17 00:00:00 2001
From: ALoTron <34157676+ALoTron@users.noreply.github.com>
Date: Sat, 21 Apr 2018 16:18:16 +0200
Subject: [PATCH 1/3] Revert Entity-spawn

---
 Assets/Scripts/Entities/Entity.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/Entities/Entity.cs b/Assets/Scripts/Entities/Entity.cs
index 7230300..6e2a9e7 100644
--- a/Assets/Scripts/Entities/Entity.cs
+++ b/Assets/Scripts/Entities/Entity.cs
@@ -17,8 +17,8 @@ public class Entity {
 	// spawns the entity
 	public void Spawn(Transform spawnPoint)
 	{
-		instance = GameObject.Instantiate (entityPrefab);
-		instance.transform = spawnPoint;
+		// instance = GameObject.Instantiate (entityPrefab);
+		// instance.transform = spawnPoint;
 	}
 
 	// kills the entity

From 8f8c5b5fb44db3f84ad05d1edca679fb485307d9 Mon Sep 17 00:00:00 2001
From: ALoTron <34157676+ALoTron@users.noreply.github.com>
Date: Sat, 21 Apr 2018 16:20:38 +0200
Subject: [PATCH 2/3] Added Collectable

---
 Assets/Scripts/Entities/Collectable.cs      |  7 +++++++
 Assets/Scripts/Entities/Collectable.cs.meta | 11 +++++++++++
 Assets/Scripts/Entities/Entity.cs           |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Assets/Scripts/Entities/Collectable.cs
 create mode 100644 Assets/Scripts/Entities/Collectable.cs.meta

diff --git a/Assets/Scripts/Entities/Collectable.cs b/Assets/Scripts/Entities/Collectable.cs
new file mode 100644
index 0000000..4e41d0e
--- /dev/null
+++ b/Assets/Scripts/Entities/Collectable.cs
@@ -0,0 +1,7 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Collectable : Entity{
+	
+}
diff --git a/Assets/Scripts/Entities/Collectable.cs.meta b/Assets/Scripts/Entities/Collectable.cs.meta
new file mode 100644
index 0000000..d1a99e5
--- /dev/null
+++ b/Assets/Scripts/Entities/Collectable.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a1c36145cdffcde4c83f575b19b85c88
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Entities/Entity.cs b/Assets/Scripts/Entities/Entity.cs
index 6e2a9e7..f640f49 100644
--- a/Assets/Scripts/Entities/Entity.cs
+++ b/Assets/Scripts/Entities/Entity.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Entity {
+public abstract class Entity {
 	EntityObjective referringObjective;
 	GameObject entityPrefab;
 	GameObject instance;

From 4fc1be09f9085182630a5a8a3d299d96a2f4465e Mon Sep 17 00:00:00 2001
From: ALoTron <34157676+ALoTron@users.noreply.github.com>
Date: Sat, 21 Apr 2018 16:23:37 +0200
Subject: [PATCH 3/3] Fixed Constructor-error in Collectable

---
 Assets/Scripts/Entities/Collectable.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Assets/Scripts/Entities/Collectable.cs b/Assets/Scripts/Entities/Collectable.cs
index 4e41d0e..4194668 100644
--- a/Assets/Scripts/Entities/Collectable.cs
+++ b/Assets/Scripts/Entities/Collectable.cs
@@ -3,5 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 
 public class Collectable : Entity{
-	
+
+	public Collectable (EntityObjective referringObjective, GameObject entityPrefab) : base(referringObjective, entityPrefab) {}
 }