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

10 files changed, 290 insertions, 64 deletions

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index b938706a0be..ed0fa9ab06a 100755
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -80,7 +80,7 @@ extern int main(int argc, char **argv)
         {
             if (++c >= argc)
             {
-                sLog->outError(LOG_FILTER_AUTHSERVER, "Runtime-Error: -c option requires an input argument");
+                printf("Runtime-Error: -c option requires an input argument");
                 usage(argv[0]);
                 return 1;
             }
@@ -92,8 +92,8 @@ extern int main(int argc, char **argv)
 
     if (!ConfigMgr::Load(cfg_file))
     {
-        sLog->outError(LOG_FILTER_AUTHSERVER, "Invalid or missing configuration file : %s", cfg_file);
-        sLog->outError(LOG_FILTER_AUTHSERVER, "Verify that the file exists and has \'[authserver]\' written in the top of the file!");
+        printf("Invalid or missing configuration file : %s", cfg_file);
+        printf("Verify that the file exists and has \'[authserver]\' written in the top of the file!");
         return 1;
     }
 
diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h
index 537bbd9c099..ba7faf60ddf 100755
--- a/src/server/game/Entities/Creature/TemporarySummon.h
+++ b/src/server/game/Entities/Creature/TemporarySummon.h
@@ -29,7 +29,7 @@ class TempSummon : public Creature
         void Update(uint32 time);
         virtual void InitStats(uint32 lifetime);
         virtual void InitSummon();
-        void UnSummon(uint32 msTime = 0);
+        virtual void UnSummon(uint32 msTime = 0);
         void RemoveFromWorld();
         void SetTempSummonType(TempSummonType type);
         void SaveToDB(uint32 /*mapid*/, uint8 /*spawnMask*/, uint32 /*phaseMask*/) {}
diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp
index 80c5de35e59..a9a0484a4ea 100755
--- a/src/server/game/Entities/Totem/Totem.cpp
+++ b/src/server/game/Entities/Totem/Totem.cpp
@@ -86,7 +86,7 @@ void Totem::InitStats(uint32 duration)
 
 void Totem::InitSummon()
 {
-    if (m_type == TOTEM_PASSIVE)
+    if (m_type == TOTEM_PASSIVE && GetSpell())
     {
         CastSpell(this, GetSpell(), true);
     }
@@ -96,10 +96,10 @@ void Totem::InitSummon()
         CastSpell(this, GetSpell(1), true);
 }
 
-void Totem::UnSummon()
+void Totem::UnSummon(uint32 msTime)
 {
     CombatStop();
-    RemoveAurasDueToSpell(GetSpell());
+    RemoveAurasDueToSpell(GetSpell(), GetGUID());
 
     // clear owner's totem slot
     for (int i = SUMMON_SLOT_TOTEM; i < MAX_TOTEM_SLOT; ++i)
@@ -111,7 +111,11 @@ void Totem::UnSummon()
         }
     }
 
-    m_owner->RemoveAurasDueToSpell(GetSpell());
+    m_owner->RemoveAurasDueToSpell(GetSpell(), GetGUID());
+
+    // Remove Sentry Totem Aura
+    if (GetEntry() == SENTRY_TOTEM_ENTRY)
+        m_owner->RemoveAurasDueToSpell(SENTRY_TOTEM_SPELLID);
 
     //remove aura all party members too
     if (Player* owner = m_owner->ToPlayer())
@@ -127,7 +131,7 @@ void Totem::UnSummon()
             {
                 Player* target = itr->getSource();
                 if (target && group->SameSubGroup(owner, target))
-                    target->RemoveAurasDueToSpell(GetSpell());
+                    target->RemoveAurasDueToSpell(GetSpell(), GetGUID());
             }
         }
     }
diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h
index c33b8776660..6271253498d 100755
--- a/src/server/game/Entities/Totem/Totem.h
+++ b/src/server/game/Entities/Totem/Totem.h
@@ -27,8 +27,10 @@ enum TotemType
     TOTEM_ACTIVE     = 1,
     TOTEM_STATUE     = 2 // copied straight from MaNGOS, may need more implementation to work
 };
+// Some Totems cast spells that are not in creature DB
+#define SENTRY_TOTEM_SPELLID  6495
 
-#define SENTRY_TOTEM_ENTRY  3968
+#define SENTRY_TOTEM_ENTRY    3968
 
 class Totem : public Minion
 {
@@ -38,7 +40,7 @@ class Totem : public Minion
         void Update(uint32 time);
         void InitStats(uint32 duration);
         void InitSummon();
-        void UnSummon();
+        void UnSummon(uint32 msTime = 0);
         uint32 GetSpell(uint8 slot = 0) const { return m_spells[slot]; }
         uint32 GetTotemDuration() const { return m_duration; }
         void SetTotemDuration(uint32 duration) { m_duration = duration; }
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index d7bb10e8ba3..b9e5523fd23 100755
--- a/src/server/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
@@ -514,8 +514,8 @@ void WorldSession::HandleTotemDestroyed(WorldPacket& recvPacket)
         return;
 
     Creature* totem = GetPlayer()->GetMap()->GetCreature(_player->m_SummonSlot[slotId]);
-    // Don't unsummon sentry totem
-    if (totem && totem->isTotem() && totem->GetEntry() != SENTRY_TOTEM_ENTRY)
+
+    if (totem && totem->isTotem())
         totem->ToTotem()->UnSummon();
 }
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
index e34e86c16a7..ed8c5351493 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -39,5 +39,9 @@
 #define DATA_PRISON_CELL6               18
 #define DATA_PRISON_CELL7               19
 #define DATA_PRISON_CELL8               20
+#define DATA_BROGGOK_LEVER              21
+#define ACTION_ACTIVATE_BROGGOK         22
+#define ACTION_RESET_BROGGOK            23
+#define ACTION_PREPARE_BROGGOK          24
 #endif
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 3a2e0834fed..84d292e1fe4 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -47,9 +47,9 @@ class boss_broggok : public CreatureScript
         {
         }
 
-        struct boss_broggokAI : public ScriptedAI
+        struct boss_broggokAI : public BossAI
         {
-            boss_broggokAI(Creature* creature) : ScriptedAI(creature)
+            boss_broggokAI(Creature* creature) : BossAI(creature, DATA_BROGGOK)
             {
                 instance = creature->GetInstanceScript();
             }
@@ -59,27 +59,21 @@ class boss_broggok : public CreatureScript
             uint32 AcidSpray_Timer;
             uint32 PoisonSpawn_Timer;
             uint32 PoisonBolt_Timer;
+            bool canAttack;
 
             void Reset()
             {
+                _Reset();
                 AcidSpray_Timer = 10000;
                 PoisonSpawn_Timer = 5000;
                 PoisonBolt_Timer = 7000;
-                if (instance)
-                {
-                    instance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED);
-                    instance->HandleGameObject(instance->GetData64(DATA_DOOR4), true);
-                }
+                DoAction(ACTION_RESET_BROGGOK);
+                instance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED);
             }
 
             void EnterCombat(Unit* /*who*/)
             {
                 DoScriptText(SAY_AGGRO, me);
-                if (instance)
-                {
-                    instance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS);
-                    instance->HandleGameObject(instance->GetData64(DATA_DOOR4), false);
-                }
             }
 
             void JustSummoned(Creature* summoned)
@@ -94,7 +88,8 @@ class boss_broggok : public CreatureScript
             {
                 if (!UpdateVictim())
                     return;
-
+                if (!canAttack)
+                    return;
                 if (AcidSpray_Timer <= diff)
                 {
                     DoCast(me->getVictim(), SPELL_SLIME_SPRAY);
@@ -132,6 +127,26 @@ class boss_broggok : public CreatureScript
                 }
             }
 
+            void DoAction(int32 const action)
+            {
+                switch (action)
+                {
+                    case ACTION_PREPARE_BROGGOK:
+                        me->SetInCombatWithZone();
+                        break;
+                    case ACTION_ACTIVATE_BROGGOK:
+                        me->SetReactState(REACT_AGGRESSIVE);
+                        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
+                        canAttack = true;
+                        break;
+                    case ACTION_RESET_BROGGOK:
+                        me->SetReactState(REACT_PASSIVE);
+                        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
+                        canAttack = false;
+                        break;
+                }
+            }
+
         };
 
         CreatureAI* GetAI(Creature* creature) const
@@ -140,7 +155,27 @@ class boss_broggok : public CreatureScript
         }
 };
 
+class go_broggok_lever : public GameObjectScript
+{
+    public:
+        go_broggok_lever() : GameObjectScript("go_broggok_lever") {}
+
+        bool OnGossipHello(Player* player, GameObject* go)
+        {
+            if (InstanceScript* instance = go->GetInstanceScript())
+                if (instance->GetData(TYPE_BROGGOK_EVENT) != DONE && instance->GetData(TYPE_BROGGOK_EVENT) != IN_PROGRESS)
+                {
+                    instance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS);
+                    if (Creature* broggok = Creature::GetCreature(*go, instance->GetData64(DATA_BROGGOK)))
+                        broggok->AI()->DoAction(ACTION_PREPARE_BROGGOK);
+                }
+            go->UseDoorOrButton();
+            return false;
+        }
+};
+
 void AddSC_boss_broggok()
 {
     new boss_broggok();
+    new go_broggok_lever();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index a0bcc396fdb..3c07862e0f6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -57,7 +57,9 @@ enum eKelidan
     SPELL_VORTEX                = 37370,
 
     ENTRY_KELIDAN               = 17377,
-    ENTRY_CHANNELER             = 17653
+    ENTRY_CHANNELER             = 17653,
+
+    ACTION_ACTIVATE_ADDS        = 92
 };
 
 const float ShadowmoonChannelers[5][4]=
@@ -107,6 +109,8 @@ class boss_kelidan_the_breaker : public CreatureScript
                 Firenova = false;
                 addYell = false;
                 SummonChannelers();
+                me->SetReactState(REACT_PASSIVE);
+                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
                 if (instance)
                     instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED);
             }
@@ -152,7 +156,8 @@ class boss_kelidan_the_breaker : public CreatureScript
                     if (channeler && channeler->isAlive())
                         return;
                 }
-
+                me->SetReactState(REACT_AGGRESSIVE);
+                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
                 if (killer)
                     me->AI()->AttackStart(killer);
             }
@@ -269,7 +274,6 @@ class boss_kelidan_the_breaker : public CreatureScript
 
                 DoMeleeAttackIfReady();
             }
-
         };
 
         CreatureAI* GetAI(Creature* creature) const
@@ -295,16 +299,11 @@ class mob_shadowmoon_channeler : public CreatureScript
 {
     public:
 
-        mob_shadowmoon_channeler()
-            : CreatureScript("mob_shadowmoon_channeler")
-        {
-        }
+        mob_shadowmoon_channeler() : CreatureScript("mob_shadowmoon_channeler") {}
 
         struct mob_shadowmoon_channelerAI : public ScriptedAI
         {
-            mob_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature)
-            {
-            }
+            mob_shadowmoon_channelerAI(Creature* creature) : ScriptedAI(creature){}
 
             uint32 ShadowBolt_Timer;
             uint32 MarkOfShadow_Timer;
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 4c434feb4ec..893f97fe711 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -26,6 +26,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "InstanceScript.h"
 #include "blood_furnace.h"
+#include "CreatureAI.h"
 
 #define ENTRY_SEWER1                 181823
 #define ENTRY_SEWER2                 181766
@@ -35,9 +36,7 @@ class instance_blood_furnace : public InstanceMapScript
 {
     public:
         instance_blood_furnace()
-            : InstanceMapScript("instance_blood_furnace", 542)
-        {
-        }
+            : InstanceMapScript("instance_blood_furnace", 542) {}
 
         struct instance_blood_furnace_InstanceMapScript : public InstanceScript
         {
@@ -63,6 +62,18 @@ class instance_blood_furnace : public InstanceMapScript
             uint64 PrisonCell7GUID;
             uint64 PrisonCell8GUID;
 
+            std::set<uint64> PrisonersCell5;
+            std::set<uint64> PrisonersCell6;
+            std::set<uint64> PrisonersCell7;
+            std::set<uint64> PrisonersCell8;
+
+            uint8 PrisonerCounter5;
+            uint8 PrisonerCounter6;
+            uint8 PrisonerCounter7;
+            uint8 PrisonerCounter8;
+
+            uint64 BroggokLeverGUID;
+
             uint32 m_auiEncounter[MAX_ENCOUNTER];
             std::string str_data;
 
@@ -89,24 +100,45 @@ class instance_blood_furnace : public InstanceMapScript
                 PrisonCell6GUID = 0;
                 PrisonCell7GUID = 0;
                 PrisonCell8GUID = 0;
+
+                PrisonersCell5.clear();
+                PrisonersCell6.clear();
+                PrisonersCell7.clear();
+                PrisonersCell8.clear();
+
+                PrisonerCounter5 = 0;
+                PrisonerCounter6 = 0;
+                PrisonerCounter7 = 0;
+                PrisonerCounter8 = 0;
+
+                BroggokLeverGUID = 0;
             }
 
             void OnCreatureCreate(Creature* creature)
             {
                 switch (creature->GetEntry())
                 {
-                     case 17381:
-                         The_MakerGUID = creature->GetGUID();
-                         break;
-                     case 17380:
-                         BroggokGUID = creature->GetGUID();
-                         break;
-                     case 17377:
-                         Kelidan_The_BreakerGUID = creature->GetGUID();
-                         break;
+                    case 17381:
+                        The_MakerGUID = creature->GetGUID();
+                        break;
+                    case 17380:
+                        BroggokGUID = creature->GetGUID();
+                        break;
+                    case 17377:
+                        Kelidan_The_BreakerGUID = creature->GetGUID();
+                        break;
+                    case 17398:
+                        StorePrisoner(creature);
+                        break;
                 }
             }
 
+            void OnCreatureDeath(Creature* unit)
+            {
+                if (unit && unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == 17398)
+                    PrisonerDied(unit->GetGUID());
+            }
+
             void OnGameObjectCreate(GameObject* go)
             {
                  if (go->GetEntry() == 181766)                //Final exit door
@@ -138,6 +170,9 @@ class instance_blood_furnace : public InstanceMapScript
                      PrisonCell7GUID = go->GetGUID();
                  if (go->GetEntry() == 181817)               //Broggok prison cell back left
                      PrisonCell8GUID = go->GetGUID();
+
+                 if (go->GetEntry() == 181982)
+                     BroggokLeverGUID = go->GetGUID();       //Broggok lever
             }
 
             uint64 GetData64(uint32 data)
@@ -161,18 +196,25 @@ class instance_blood_furnace : public InstanceMapScript
                      case DATA_PRISON_CELL6:         return PrisonCell6GUID;
                      case DATA_PRISON_CELL7:         return PrisonCell7GUID;
                      case DATA_PRISON_CELL8:         return PrisonCell8GUID;
+                     case DATA_BROGGOK_LEVER:        return BroggokLeverGUID;
                 }
-
                 return 0;
             }
 
-            void SetData(uint32 /*type*/, uint32 data)
+            void SetData(uint32 type, uint32 data)
             {
-                 switch (data)
+                 switch (type)
                  {
-                     case TYPE_THE_MAKER_EVENT:             m_auiEncounter[0] = data;     break;
-                     case TYPE_BROGGOK_EVENT:               m_auiEncounter[1] = data;     break;
-                     case TYPE_KELIDAN_THE_BREAKER_EVENT:   m_auiEncounter[2] = data;     break;
+                     case TYPE_THE_MAKER_EVENT:
+                         m_auiEncounter[0] = data;
+                         break;
+                     case TYPE_BROGGOK_EVENT:
+                         m_auiEncounter[1] = data;
+                         UpdateBroggokEvent(data);
+                         break;
+                     case TYPE_KELIDAN_THE_BREAKER_EVENT:
+                         m_auiEncounter[2] = data;
+                         break;
                  }
 
                 if (data == DONE)
@@ -189,15 +231,14 @@ class instance_blood_furnace : public InstanceMapScript
                 }
             }
 
-            uint32 GetData(uint32 data)
+            uint32 GetData(uint32 type)
             {
-                switch (data)
+                switch (type)
                 {
                     case TYPE_THE_MAKER_EVENT:             return m_auiEncounter[0];
                     case TYPE_BROGGOK_EVENT:               return m_auiEncounter[1];
                     case TYPE_KELIDAN_THE_BREAKER_EVENT:   return m_auiEncounter[2];
                 }
-
                 return 0;
             }
 
@@ -225,6 +266,147 @@ class instance_blood_furnace : public InstanceMapScript
 
                 OUT_LOAD_INST_DATA_COMPLETE;
             }
+
+            void UpdateBroggokEvent(uint32 data)
+            {
+                switch (data)
+                {
+                    case IN_PROGRESS:
+                        ActivateCell(DATA_PRISON_CELL5);
+                        HandleGameObject(Door4GUID, false);
+                        break;
+                    case NOT_STARTED:
+                        ResetPrisons();
+                        HandleGameObject(Door5GUID, false);
+                        HandleGameObject(Door4GUID, true);
+                        if (GameObject* lever = instance->GetGameObject(BroggokLeverGUID))
+                            lever->Respawn();
+                        break;
+                }
+            }
+
+            void ResetPrisons()
+            {
+                PrisonerCounter5 = PrisonersCell5.size();
+                ResetPrisoners(PrisonersCell5);
+                HandleGameObject(PrisonCell5GUID, false);
+
+                PrisonerCounter6 = PrisonersCell6.size();
+                ResetPrisoners(PrisonersCell6);
+                HandleGameObject(PrisonCell6GUID, false);
+
+                PrisonerCounter7 = PrisonersCell7.size();
+                ResetPrisoners(PrisonersCell7);
+                HandleGameObject(PrisonCell7GUID, false);
+
+                PrisonerCounter8 = PrisonersCell8.size();
+                ResetPrisoners(PrisonersCell8);
+                HandleGameObject(PrisonCell8GUID, false);
+            }
+
+            void ResetPrisoners(std::set<uint64> prisoners)
+            {
+                for (std::set<uint64>::iterator i = prisoners.begin(); i != prisoners.end(); ++i)
+                    if (Creature* prisoner = instance->GetCreature(*i))
+                        ResetPrisoner(prisoner);
+            }
+
+            void ResetPrisoner(Creature* prisoner)
+            {
+                if (!prisoner->isAlive())
+                    prisoner->Respawn(true);
+                prisoner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
+            }
+
+            void StorePrisoner(Creature* creature)
+            {
+                float posX = creature->GetPositionX();
+                float posY = creature->GetPositionY();
+
+                if (posX >= 405.0f && posX <= 423.0f)
+                {
+                    if (posY >= 106.0f && posY <= 123.0f)
+                    {
+                        PrisonersCell5.insert(creature->GetGUID());
+                        ++PrisonerCounter5;
+                    }
+                    else if (posY >= 76.0f && posY <= 91.0f)
+                    {
+                        PrisonersCell6.insert(creature->GetGUID());
+                        ++PrisonerCounter6;
+                    }
+                    else return;
+                }
+                else if (posX >= 490.0f && posX <= 506.0f)
+                {
+                    if (posY >= 106.0f && posY <= 123.0f)
+                    {
+                        PrisonersCell7.insert(creature->GetGUID());
+                        ++PrisonerCounter7;
+                    }
+                    else if (posY >= 76.0f && posY <= 91.0f)
+                    {
+                        PrisonersCell8.insert(creature->GetGUID());
+                        ++PrisonerCounter8;
+                    }
+                    else
+                    	return;
+                }
+                else
+                	return;
+
+                ResetPrisoner(creature);
+            }
+
+            void PrisonerDied(uint64 guid)
+            {
+                if (PrisonersCell5.find(guid) != PrisonersCell5.end() && --PrisonerCounter5 <= 0)
+                    ActivateCell(DATA_PRISON_CELL6);
+                else if (PrisonersCell6.find(guid) != PrisonersCell6.end() && --PrisonerCounter6 <= 0)
+                    ActivateCell(DATA_PRISON_CELL7);
+                else if (PrisonersCell7.find(guid) != PrisonersCell7.end() && --PrisonerCounter7 <= 0)
+                    ActivateCell(DATA_PRISON_CELL8);
+                else if (PrisonersCell8.find(guid) != PrisonersCell8.end() && --PrisonerCounter8 <= 0)
+                    ActivateCell(DATA_DOOR5);
+            }
+
+            void ActivateCell(uint8 id)
+            {
+                switch (id)
+                {
+                    case DATA_PRISON_CELL5:
+                        HandleGameObject(PrisonCell5GUID,true);
+                        ActivatePrisoners(PrisonersCell5);
+                        break;
+                    case DATA_PRISON_CELL6:
+                        HandleGameObject(PrisonCell6GUID,true);
+                        ActivatePrisoners(PrisonersCell6);
+                        break;
+                    case DATA_PRISON_CELL7:
+                        HandleGameObject(PrisonCell7GUID,true);
+                        ActivatePrisoners(PrisonersCell7);
+                        break;
+                    case DATA_PRISON_CELL8:
+                        HandleGameObject(PrisonCell8GUID,true);
+                        ActivatePrisoners(PrisonersCell8);
+                        break;
+                    case DATA_DOOR5:
+                        HandleGameObject(Door5GUID,true);
+                        if (Creature* broggok = instance->GetCreature(BroggokGUID))
+                            broggok->AI()->DoAction(ACTION_ACTIVATE_BROGGOK);
+                        break;
+                }
+            }
+
+            void ActivatePrisoners(std::set<uint64> prisoners)
+            {
+                for (std::set<uint64>::iterator i = prisoners.begin(); i != prisoners.end(); ++i)
+                    if (Creature* prisoner = instance->GetCreature(*i))
+                    {
+                        prisoner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
+                        prisoner->SetInCombatWithZone();
+                    }
+            }
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 862ed28f2d3..7e43cf87dfc 100755
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -81,7 +81,7 @@ extern int main(int argc, char **argv)
         {
             if (++c >= argc)
             {
-                sLog->outError(LOG_FILTER_WORLDSERVER, "Runtime-Error: -c option requires an input argument");
+                printf("Runtime-Error: -c option requires an input argument");
                 usage(argv[0]);
                 return 1;
             }
@@ -97,25 +97,25 @@ extern int main(int argc, char **argv)
         {
             if (++c >= argc)
             {
-                sLog->outError(LOG_FILTER_WORLDSERVER, "Runtime-Error: -s option requires an input argument");
+                printf("Runtime-Error: -s option requires an input argument");
                 usage(argv[0]);
                 return 1;
             }
             if (strcmp(argv[c], "install") == 0)
             {
                 if (WinServiceInstall())
-                    sLog->outInfo(LOG_FILTER_WORLDSERVER, "Installing service");
+                    printf("Installing service");
                 return 1;
             }
             else if (strcmp(argv[c], "uninstall") == 0)
             {
                 if (WinServiceUninstall())
-                    sLog->outInfo(LOG_FILTER_WORLDSERVER, "Uninstalling service");
+                    printf("Uninstalling service");
                 return 1;
             }
             else
             {
-                sLog->outError(LOG_FILTER_WORLDSERVER, "Runtime-Error: unsupported option %s", argv[c]);
+                printf("Runtime-Error: unsupported option %s", argv[c]);
                 usage(argv[0]);
                 return 1;
             }
@@ -131,8 +131,8 @@ extern int main(int argc, char **argv)
 
     if (!ConfigMgr::Load(cfg_file))
     {
-        sLog->outError(LOG_FILTER_WORLDSERVER, "Invalid or missing configuration file : %s", cfg_file);
-        sLog->outError(LOG_FILTER_WORLDSERVER, "Verify that the file exists and has \'[worldserver]' written in the top of the file!");
+        printf("Invalid or missing configuration file : %s", cfg_file);
+        printf("Verify that the file exists and has \'[worldserver]' written in the top of the file!");
         return 1;
     }
     sLog->outInfo(LOG_FILTER_WORLDSERVER, "Using configuration file %s.", cfg_file);