Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

3 files changed, 30 insertions, 8 deletions

diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index 3ffb873e4d2..74fad4f94d8 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -95,14 +95,17 @@ class boss_archaedas : public CreatureScript
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
             }
 
-            void ActivateMinion(uint64 uiGuid, bool bFlag)
+            void ActivateMinion(uint64 uiGuid, bool flag)
             {
-                Unit* pMinion = Unit::GetUnit(*me, uiGuid);
+                Unit* minion = Unit::GetUnit(*me, uiGuid);
 
-                if (pMinion && pMinion->isAlive())
+                if (minion && minion->isAlive())
                 {
-                    DoCast(pMinion, SPELL_AWAKEN_VAULT_WALKER, bFlag);
-                    pMinion->CastSpell(pMinion, SPELL_ARCHAEDAS_AWAKEN, true);
+                    DoCast(minion, SPELL_AWAKEN_VAULT_WALKER, flag);
+                    minion->CastSpell(minion, SPELL_ARCHAEDAS_AWAKEN, true);
+                    minion->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    minion->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE);
+                    minion->setFaction(14);
                 }
             }
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index ade07039a23..ee82da668f8 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -202,6 +202,9 @@ class instance_uldaman : public InstanceMapScript
                         continue;
                     archaedas->CastSpell(target, SPELL_AWAKEN_VAULT_WALKER, true);
                     target->CastSpell(target, SPELL_ARCHAEDAS_AWAKEN, true);
+                    target->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE);
+                    target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    target->setFaction(14);
                     return;        // only want the first one we find
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 83cd0b46fb8..32831eb047b 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -45,6 +45,8 @@ EndScriptData */
 //Ohgans Spells
 #define SPELL_SUNDERARMOR       24317
 
+#define NPC_SPEAKER             11391
+
 class boss_mandokir : public CreatureScript
 {
     public:
@@ -79,6 +81,7 @@ class boss_mandokir : public CreatureScript
             bool someWatched;
             bool RaptorDead;
             bool CombatStart;
+            bool SpeakerDead;
 
             uint64 WatchTarget;
 
@@ -103,6 +106,7 @@ class boss_mandokir : public CreatureScript
                 endWatch = false;
                 RaptorDead = false;
                 CombatStart = false;
+                SpeakerDead = false;
 
                 DoCast(me, 23243);
             }
@@ -129,19 +133,31 @@ class boss_mandokir : public CreatureScript
                                 }
                             }
                         }
-                    DoCast(me, SPELL_LEVEL_UP, true);
-                     KillCount = 0;
+                        DoCast(me, SPELL_LEVEL_UP, true);
+                        KillCount = 0;
                     }
                 }
             }
 
             void EnterCombat(Unit* /*who*/)
             {
-             DoScriptText(SAY_AGGRO, me);
+                DoScriptText(SAY_AGGRO, me);
             }
 
             void UpdateAI(const uint32 diff)
             {
+                if (!SpeakerDead)
+                {
+                    if (!me->FindNearestCreature(NPC_SPEAKER, 100.0f, true))
+                    {
+                        me->GetMotionMaster()->MovePoint(0, -12196.3f, -1948.37f, 130.36f);
+                        SpeakerDead = true;
+                    }
+                }
+
+                if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE && SpeakerDead)
+                    me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+
                 if (!UpdateVictim())
                     return;