diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-15 14:23:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-15 14:23:21 +0100 |
| commit | 6beda05e3d5cdf77a49fa1fcdfd5e64070d7a10c (patch) | |
| tree | 6106a48422550d02d501b276024c9c8306cff84e /src/server/scripts | |
| parent | 3c5bf554ffa58e46eb88aebd46af21335d581432 (diff) | |
| parent | 45363b8216f03f2dd4ce21cfb5ce183560374dd8 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.h
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 58301df4ca2..76b2e7bac7e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -148,6 +148,7 @@ class boss_drakkari_colossus : public CreatureScript DoCast(SPELL_EMERGE); break; case ACTION_FREEZE_COLOSSUS: + me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->SetReactState(REACT_PASSIVE); |