Making sure CreaturesAddon are re-loaded after creature evade (by NoFantasy).

--HG--
branch : trunk

2 files changed, 1 insertions, 2 deletions

diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index c040274980b..1b5a41a692e 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -882,8 +882,6 @@ void CreatureEventAI::Reset()
 
 void CreatureEventAI::JustReachedHome()
 {
-    me->LoadCreaturesAddon();
-
     if (!m_bEmptyList)
     {
         for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
index df32d6a0e1f..15b29f9e409 100644
--- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
@@ -80,6 +80,7 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff
         }
 
         owner.clearUnitState(UNIT_STAT_EVADE);
+        owner.LoadCreaturesAddon(true);
         owner.AI()->JustReachedHome();
         return false;
     }