aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-31 16:25:27 -0500
committermegamage <none@none>2009-05-31 16:25:27 -0500
commit5612f1221c357f5cbb0720ddf200e7f5f40544be (patch)
treefc61b247088ebd22f9c80902cef522dd16a9a6c2 /src
parent72cab37bcc434afd3dcae83acba14380cf0a94cb (diff)
[7924] Not teleport player to non-player caster at ressurection. Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 48386d8416f..49da25bb634 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);