mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11044] Make EffectDistract implementation less hacky

Browse source
This commit is contained in:
zergtmn 2011-01-19 23:13:12 +05:00
parent 0f70e9a79c
commit 9bc37afa28
3 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/game/SpellEffects.cpp
View file

@ -4583,26 +4583,17 @@ void Spell::EffectDistract(SpellEffectIndex /*eff_idx*/)
return;
// target must be OK to do this
if( unitTarget->hasUnitState(UNIT_STAT_CAN_NOT_REACT) )
if (unitTarget->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
return;
float angle = unitTarget->GetAngle(m_targets.m_destX, m_targets.m_destY);
if ( unitTarget->GetTypeId() == TYPEID_PLAYER )
{
// For players just turn them
WorldPacket data;
((Player*)unitTarget)->BuildTeleportAckMsg(&data, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), angle);
((Player*)unitTarget)->GetSession()->SendPacket( &data );
((Player*)unitTarget)->SetPosition(unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), angle, false);
}
else
{
// Set creature Distracted, Stop it, And turn it
unitTarget->SetOrientation(angle);
unitTarget->StopMoving();
unitTarget->clearUnitState(UNIT_STAT_MOVING);
unitTarget->SetOrientation(angle);
unitTarget->SendMonsterMove(unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), SPLINETYPE_FACINGANGLE, SPLINEFLAG_WALKMODE, 0, NULL, angle);
if (unitTarget->GetTypeId() == TYPEID_UNIT)
unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS);
}
}
void Spell::EffectPickPocket(SpellEffectIndex /*eff_idx*/)