From 43562580d6771577df26b554b07fd3a67aa1a537 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Thu, 22 Oct 2020 11:16:28 -0400
Subject: [PATCH] Fixes

---
 pom.xml                                       |  2 +-
 .../com/volmit/iris/link/CitizensLink.java    | 52 +++++++++----------
 .../com/volmit/iris/object/IrisEntity.java    |  6 ++-
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e7a45f33..6e932f476 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bytecode.ninja</groupId>
 	<artifactId>Iris</artifactId>
-	<version>1.0.22</version>
+	<version>1.0.23</version>
 	<name>Iris</name>
 	<properties>
 		<skip.copy>false</skip.copy>
diff --git a/src/main/java/com/volmit/iris/link/CitizensLink.java b/src/main/java/com/volmit/iris/link/CitizensLink.java
index 7dea73570..af3a56960 100644
--- a/src/main/java/com/volmit/iris/link/CitizensLink.java
+++ b/src/main/java/com/volmit/iris/link/CitizensLink.java
@@ -10,37 +10,37 @@ import org.bukkit.plugin.Plugin;
 
 public class CitizensLink
 {
-    public CitizensLink()
-    {
+	public CitizensLink()
+	{
 
-    }
+	}
 
-    public boolean supported()
-    {
-        return getCitizens() != null;
-    }
+	public boolean supported()
+	{
+		return getCitizens() != null;
+	}
 
-    public Entity spawn(EntityType name, Location a)
-    {
-        if(!supported())
-        {
-            return null;
-        }
+	public Entity spawn(EntityType type, String npcType, Location a)
+	{
+		if(!supported())
+		{
+			return null;
+		}
 
-        NPC npc = CitizensAPI.getNPCRegistry().createNPC(name, "");
-        npc.spawn(a);
-        return npc.getEntity();
-    }
+		NPC npc = CitizensAPI.getNPCRegistry().createNPC(type, "");
+		npc.spawn(a);
+		return npc.getEntity();
+	}
 
-    public Plugin getCitizens()
-    {
-        Plugin p = Bukkit.getPluginManager().getPlugin("Citizens");
+	public Plugin getCitizens()
+	{
+		Plugin p = Bukkit.getPluginManager().getPlugin("Citizens");
 
-        if(p == null)
-        {
-            return null;
-        }
+		if(p == null)
+		{
+			return null;
+		}
 
-        return p;
-    }
+		return p;
+	}
 }
diff --git a/src/main/java/com/volmit/iris/object/IrisEntity.java b/src/main/java/com/volmit/iris/object/IrisEntity.java
index 19ac11468..19eeec94c 100644
--- a/src/main/java/com/volmit/iris/object/IrisEntity.java
+++ b/src/main/java/com/volmit/iris/object/IrisEntity.java
@@ -295,7 +295,7 @@ public class IrisEntity extends IrisRegistrant
 
 		if(isCitizens())
 		{
-			return Iris.linkCitizens.spawn(getType(), at);
+			// TODO: return Iris.linkCitizens.spawn(getType(), at); SPAWN SOME TYPE TOO
 		}
 
 		return at.getWorld().spawnEntity(at, getType());
@@ -308,6 +308,8 @@ public class IrisEntity extends IrisRegistrant
 
 	public boolean isCitizens()
 	{
-		return Iris.linkCitizens.supported(); // TODO Need to determine how to tell if entity needs to be Citizen NPC (eg. getCitizensType())
+		return false;
+
+		// TODO: return Iris.linkCitizens.supported() && someType is not empty;
 	}
 }