mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07: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; return;
// target must be OK to do this // target must be OK to do this
if( unitTarget->hasUnitState(UNIT_STAT_CAN_NOT_REACT) ) if (unitTarget->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
return; return;
float angle = unitTarget->GetAngle(m_targets.m_destX, m_targets.m_destY); float angle = unitTarget->GetAngle(m_targets.m_destX, m_targets.m_destY);
if ( unitTarget->GetTypeId() == TYPEID_PLAYER ) unitTarget->clearUnitState(UNIT_STAT_MOVING);
{ unitTarget->SetOrientation(angle);
// For players just turn them unitTarget->SendMonsterMove(unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), SPLINETYPE_FACINGANGLE, SPLINEFLAG_WALKMODE, 0, NULL, angle);
WorldPacket data;
((Player*)unitTarget)->BuildTeleportAckMsg(&data, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), angle); if (unitTarget->GetTypeId() == TYPEID_UNIT)
((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->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS); unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS);
}
} }
void Spell::EffectPickPocket(SpellEffectIndex /*eff_idx*/) void Spell::EffectPickPocket(SpellEffectIndex /*eff_idx*/)

3
src/game/Unit.cpp
View file

@ -364,7 +364,6 @@ bool Unit::haveOffhandWeapon() const
void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, SplineType type, SplineFlags flags, uint32 Time, Player* player, ...) void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, SplineType type, SplineFlags flags, uint32 Time, Player* player, ...)
{ {
va_list vargs; va_list vargs;
va_start(vargs,player); va_start(vargs,player);
@ -395,7 +394,7 @@ void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, SplineTy
case SPLINETYPE_FACINGTARGET: case SPLINETYPE_FACINGTARGET:
data << uint64(va_arg(vargs,uint64)); data << uint64(va_arg(vargs,uint64));
break; break;
case SPLINETYPE_FACINGANGLE: // not used currently case SPLINETYPE_FACINGANGLE:
data << float(va_arg(vargs,double)); // facing angle data << float(va_arg(vargs,double)); // facing angle
break; break;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11043" #define REVISION_NR "11044"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__