josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merged with 487

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Blaymoira
2008-12-13 21:22:02 +01:00
parent ed7a4d9831 4b64670f70
commit 4c2f8b2222
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+8
View File
@@ -12824,6 +12824,7 @@ void Unit::SetFeared(bool apply)
if(HasAuraType(SPELL_AURA_PREVENTS_FLEEING)) if(HasAuraType(SPELL_AURA_PREVENTS_FLEEING))
return; return;
SetUInt64Value(UNIT_FIELD_TARGET, 0);
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING); SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING);
CastStop(); CastStop();
//GetMotionMaster()->MovementExpired(false); //GetMotionMaster()->MovementExpired(false);
@@ -12839,7 +12840,10 @@ void Unit::SetFeared(bool apply)
if(isAlive()) if(isAlive())
{ {
if( GetTypeId() != TYPEID_PLAYER && getVictim()) if( GetTypeId() != TYPEID_PLAYER && getVictim())
{
SetUInt64Value(UNIT_FIELD_TARGET, getVictim()->GetGUID());
GetMotionMaster()->MoveChase(getVictim()); GetMotionMaster()->MoveChase(getVictim());
}
else else
GetMotionMaster()->Initialize(); GetMotionMaster()->Initialize();
} }
@@ -12853,6 +12857,7 @@ void Unit::SetConfused(bool apply)
{ {
if(apply) if(apply)
{ {
SetUInt64Value(UNIT_FIELD_TARGET, 0);
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED); SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED);
CastStop(); CastStop();
GetMotionMaster()->MoveConfused(); GetMotionMaster()->MoveConfused();
@@ -12863,7 +12868,10 @@ void Unit::SetConfused(bool apply)
if(isAlive()) if(isAlive())
{ {
if( GetTypeId() != TYPEID_PLAYER && getVictim()) if( GetTypeId() != TYPEID_PLAYER && getVictim())
{
SetUInt64Value(UNIT_FIELD_TARGET, getVictim()->GetGUID());
GetMotionMaster()->MoveChase(getVictim()); GetMotionMaster()->MoveChase(getVictim());
}
else else
GetMotionMaster()->Initialize(); GetMotionMaster()->Initialize();
} }