1 files changed, 29 insertions, 30 deletions

diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index cf63419303d..2f527cd5e99 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -876,7 +876,9 @@ public:
         if (!player)
             return false;
 
-        if (!creature)
+        if (creature)
+            lowguid = creature->GetSpawnId();
+        else
         {
             // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r
             char* cId = handler->extractKeyFromLink((char*)args, "Hcreature");
@@ -884,48 +886,45 @@ public:
                 return false;
 
             lowguid = atoul(cId);
-
-            // Attempting creature load from DB data
-            CreatureData const* data = sObjectMgr->GetCreatureData(lowguid);
-            if (!data)
-            {
-                handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
-                handler->SetSentErrorMessage(true);
-                return false;
-            }
-
-            if (player->GetMapId() != data->spawnPoint.GetMapId())
-            {
-                handler->PSendSysMessage(LANG_COMMAND_CREATUREATSAMEMAP, lowguid);
-                handler->SetSentErrorMessage(true);
-                return false;
-            }
         }
-        else
-            lowguid = creature->GetSpawnId();
+        // Attempting creature load from DB data
+        CreatureData const* data = sObjectMgr->GetCreatureData(lowguid);
+        if (!data)
+        {
+            handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
+            handler->SetSentErrorMessage(true);
+            return false;
+        }
 
-        if (creature)
+        if (player->GetMapId() != data->spawnPoint.GetMapId())
         {
-            sObjectMgr->NewOrExistCreatureData(creature->GetSpawnId()).spawnPoint.Relocate(*player);
-            creature->UpdatePosition(*player);
-            creature->GetMotionMaster()->Initialize();
-            if (creature->IsAlive())                            // dead creature will reset movement generator at respawn
-            {
-                creature->setDeathState(JUST_DIED);
-                creature->Respawn();
-            }
+            handler->PSendSysMessage(LANG_COMMAND_CREATUREATSAMEMAP, lowguid);
+            handler->SetSentErrorMessage(true);
+            return false;
         }
 
-        PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_POSITION);
+        // update position in memory
+        const_cast<CreatureData*>(data)->spawnPoint.Relocate(*player);
 
+        // update position in DB
+        PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_POSITION);
         stmt->setFloat(0, player->GetPositionX());
         stmt->setFloat(1, player->GetPositionY());
         stmt->setFloat(2, player->GetPositionZ());
         stmt->setFloat(3, player->GetOrientation());
         stmt->setUInt32(4, lowguid);
-
         WorldDatabase.Execute(stmt);
 
+        // respawn selected creature at the new location
+        if (creature)
+        {
+            if (creature->IsAlive())
+                creature->setDeathState(JUST_DIED);
+            creature->Respawn(true);
+            if (!creature->GetRespawnCompatibilityMode())
+                creature->AddObjectToRemoveList();
+        }
+
         handler->PSendSysMessage(LANG_COMMAND_CREATUREMOVED);
         return true;
     }