aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2011-04-29 23:04:18 +0300
committerShocker <shocker@freakz.ro>2011-04-29 23:05:29 +0300
commitf8ca5aaa9b070ecff4d43c71e44a19c0cf4fdab6 (patch)
tree6b33c1e9a4e7d29bb46474415fc73e138c279b76
parent0fb8f057974cdf3107084be65005956efb5191dc (diff)
Core/Spells: Demonic Circle shouldn't remove combat from player.
Closes #1324
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuras.cpp4
1 files changed, 2 insertions, 2 deletions
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;
}