diff options
| author | Subv <subv2112@gmail.com> | 2014-07-03 15:57:47 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-07-03 15:57:47 -0500 |
| commit | 151785b9ced2d6fa2d6c422fff7c53672c18ba98 (patch) | |
| tree | f41249f60a739f408ce226252d375ab04e65c8fd /src/server/game/AI/SmartScripts | |
| parent | 0a07fd5fc38f5b3beac187de88dcd26cb60d9f76 (diff) | |
| parent | 7b74a725c89cca383acab8a002c162fc7ff1e0ac (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
Conflicts:
src/server/game/World/World.cpp
Diffstat (limited to 'src/server/game/AI/SmartScripts')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index e36433dd8c0..af47b52f500 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -537,9 +537,9 @@ void SmartAI::JustRespawned() me->SetVisible(true); if (me->getFaction() != me->GetCreatureTemplate()->faction) me->RestoreFaction(); - GetScript()->ProcessEventsFor(SMART_EVENT_RESPAWN); mJustReset = true; JustReachedHome(); + GetScript()->ProcessEventsFor(SMART_EVENT_RESPAWN); mFollowGuid = 0;//do not reset follower on Reset(), we need it after combat evade mFollowDist = 0; mFollowAngle = 0; |