From 57cc1fcb6417c5202cb40dc2c164d985bc1fd3d4 Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Mon, 28 Oct 2013 15:51:21 -0700
Subject: [PATCH] Use Citizens' NPC.teleport() function, fixes #492

---
 src/main/java/net/aufdemrand/denizen/objects/dEntity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
index 5b34e4d199..4372d9f4ed 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -592,7 +592,8 @@ public World getWorld() {
 
     public void spawnAt(Location location) {
         // If the entity is already spawned, teleport it.
-        if (entity != null && isUnique()) entity.teleport(location);
+        if (npc != null) npc.teleport(location, TeleportCause.PLUGIN);
+        else if (entity != null && isUnique()) entity.teleport(location);
 
         else {
             if (npc != null) {