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
This commit is contained in:
commit
6beda05e3d
12 files changed
+77
-19
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user