Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Check reactstate in UpdateVictim.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-21 17:19:10 -05:00
parent 67255e536b
commit 239919abb2
5 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
View File

@@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
void UpdateAI(const uint32 diff)
{
if(!UpdateVictimByReact() || !CheckInRoom())
if(!UpdateVictim() || !CheckInRoom())
return;
events.Update(diff);

2
src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
View File

@@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL boss_nothAI : public BossAI
void UpdateAI(const uint32 diff)
{
if(!UpdateVictimByReact() || !CheckInRoom())
if(!UpdateVictim() || !CheckInRoom())
return;
events.Update(diff);

2
src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
View File

@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
if(!phase)
return;
if(!UpdateVictimByReact() || !CheckInRoom())
if(!UpdateVictim() || !CheckInRoom())
return;
events.Update(diff);

13
src/game/CreatureAI.cpp
View File

@@ -134,12 +134,12 @@ bool CreatureAI::UpdateVictimWithGaze()
return me->getVictim();
}
bool CreatureAI::UpdateVictimByReact()
bool CreatureAI::UpdateVictim()
{
if(!me->isInCombat())
return false;
if(me->HasReactState(REACT_AGGRESSIVE))
if(!me->HasReactState(REACT_PASSIVE))
{
if(Unit *victim = me->SelectVictim())
AttackStart(victim);
@@ -154,15 +154,6 @@ bool CreatureAI::UpdateVictimByReact()
return true;
}
bool CreatureAI::UpdateVictim()
{
if(!me->isInCombat())
return false;
if(Unit *victim = me->SelectVictim())
AttackStart(victim);
return me->getVictim();
}
bool CreatureAI::_EnterEvadeMode()
{
if(me->IsInEvadeMode() || !me->isAlive())

1
src/game/CreatureAI.h
View File

@@ -71,7 +71,6 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI
Creature * const m_creature;
bool UpdateVictim();
bool UpdateVictimByReact();
bool UpdateVictimWithGaze();
void SelectNearestTarget(Unit *who);