From 5612f1221c357f5cbb0720ddf200e7f5f40544be Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sun, 31 May 2009 16:25:27 -0500
Subject: [PATCH] [7924] Not teleport player to non-player caster at
 ressurection. Author: VladimirMangos

--HG--
branch : trunk
---
 src/game/Player.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 48386d8416..49da25bb63 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -19497,8 +19497,9 @@ uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const
 
 void Player::ResurectUsingRequestData()
 {
-    /// Teleport before resurrecting, otherwise the player might get attacked from creatures near his corpse
-    TeleportTo(m_resurrectMap, m_resurrectX, m_resurrectY, m_resurrectZ, GetOrientation());
+    /// Teleport before resurrecting by player, otherwise the player might get attacked from creatures near his corpse
+    if(IS_PLAYER_GUID(m_resurrectGUID))
+        TeleportTo(m_resurrectMap, m_resurrectX, m_resurrectY, m_resurrectZ, GetOrientation());
 
     ResurrectPlayer(0.0f,false);