yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move On_Reset calls in HookMgr.

Browse Source 
On_Reset should be called whether or not the hooks that call it have
events.
This commit is contained in:
Patman64
2015-01-06 20:03:00 -05:00
parent 0f24a77351
commit f38591565f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
HookMgr.cpp
View File

@@ -1915,10 +1915,11 @@ bool Eluna::DamageTaken(Creature* me, Unit* attacker, uint32& damage)
//Called at creature death //Called at creature death
bool Eluna::JustDied(Creature* me, Unit* killer) bool Eluna::JustDied(Creature* me, Unit* killer)
{ {
On_Reset(me);
if (!CreatureEventBindings->HasEvents(CREATURE_EVENT_ON_DIED, me->GetEntry())) if (!CreatureEventBindings->HasEvents(CREATURE_EVENT_ON_DIED, me->GetEntry()))
return false; return false;
On_Reset(me);
LOCK_ELUNA; LOCK_ELUNA;
Push(me); Push(me);
Push(killer); Push(killer);
@@ -1989,10 +1990,11 @@ bool Eluna::AttackStart(Creature* me, Unit* target)
// Called for reaction at stopping attack at no attackers or targets // Called for reaction at stopping attack at no attackers or targets
bool Eluna::EnterEvadeMode(Creature* me) bool Eluna::EnterEvadeMode(Creature* me)
{ {
On_Reset(me);
if (!CreatureEventBindings->HasEvents(CREATURE_EVENT_ON_LEAVE_COMBAT, me->GetEntry())) if (!CreatureEventBindings->HasEvents(CREATURE_EVENT_ON_LEAVE_COMBAT, me->GetEntry()))
return false; return false;
On_Reset(me);
LOCK_ELUNA; LOCK_ELUNA;
Push(me); Push(me);
return CallAllFunctionsBool(CreatureEventBindings, CREATURE_EVENT_ON_LEAVE_COMBAT, me->GetEntry()); return CallAllFunctionsBool(CreatureEventBindings, CREATURE_EVENT_ON_LEAVE_COMBAT, me->GetEntry());
@@ -2013,10 +2015,11 @@ bool Eluna::AttackedBy(Creature* me, Unit* attacker)
// Called when creature is spawned or respawned (for reseting variables) // Called when creature is spawned or respawned (for reseting variables)
bool Eluna::JustRespawned(Creature* me) bool Eluna::JustRespawned(Creature* me)
{ {
On_Reset(me);
if (!CreatureEventBindings->HasEvents(CREATURE_EVENT_ON_SPAWN, me->GetEntry())) if (!CreatureEventBindings->HasEvents(CREATURE_EVENT_ON_SPAWN, me->GetEntry()))
return false; return false;
On_Reset(me);
LOCK_ELUNA; LOCK_ELUNA;
Push(me); Push(me);
return CallAllFunctionsBool(CreatureEventBindings, CREATURE_EVENT_ON_SPAWN, me->GetEntry()); return CallAllFunctionsBool(CreatureEventBindings, CREATURE_EVENT_ON_SPAWN, me->GetEntry());