From f8ca5aaa9b070ecff4d43c71e44a19c0cf4fdab6 Mon Sep 17 00:00:00 2001 From: Shocker Date: Fri, 29 Apr 2011 23:04:18 +0300 Subject: Core/Spells: Demonic Circle shouldn't remove combat from player. Closes #1324 --- src/server/game/Spells/Auras/SpellAuras.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index b8967aa1845..9298cf7c464 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1026,8 +1026,8 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (target->GetTypeId() == TYPEID_PLAYER) if (GameObject* obj = target->GetGameObject(48018)) { - target->ToPlayer()->TeleportTo(obj->GetMapId(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation()); - target->ToPlayer()->RemoveMovementImpairingAuras(); + target->NearTeleportTo(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation()); + target->RemoveMovementImpairingAuras(); } break; } -- cgit v1.2.3