Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp

src/server/scripts/Commands/cs_account.cpp

@@ -22,10 +22,11 @@ Comment: All account related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
 #include "AccountMgr.h"
 #include "Chat.h"
+#include "Language.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class account_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_achievement.cpp

@@ -22,9 +22,11 @@ Comment: All achievement related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
+#include "AchievementMgr.h"
 #include "Chat.h"
+#include "Language.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class achievement_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_ban.cpp

@@ -22,12 +22,13 @@ Comment: All ban related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "Chat.h"
 #include "AccountMgr.h"
+#include "Chat.h"
+#include "Language.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class ban_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_cast.cpp

@@ -24,6 +24,8 @@ EndScriptData */
 
 #include "ScriptMgr.h"
 #include "Chat.h"
+#include "Creature.h"
+#include "Language.h"
 #include "Player.h"
 
 class cast_commandscript : public CommandScript

src/server/scripts/Commands/cs_character.cpp

@@ -22,12 +22,13 @@ Comment: All character related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "Chat.h"
 #include "AccountMgr.h"
+#include "Chat.h"
 #include "ObjectMgr.h"
 #include "PlayerDump.h"
 #include "Player.h"
+#include "ReputationMgr.h"
+#include "ScriptMgr.h"
 
 class character_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_cheat.cpp

@@ -22,10 +22,11 @@ Comment: All cheat related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
 #include "Chat.h"
+#include "Language.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class cheat_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_debug.cpp

@@ -31,6 +31,7 @@ EndScriptData */
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "GossipDef.h"
+#include "Language.h"
 
 #include <fstream>
 

src/server/scripts/Commands/cs_disable.cpp

@@ -22,13 +22,15 @@ Comment: All disable related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
+#include "AchievementMgr.h"
 #include "Chat.h"
 #include "DisableMgr.h"
+#include "Language.h"
+#include "ObjectMgr.h"
 #include "OutdoorPvP.h"
-#include "SpellMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
+#include "SpellMgr.h"
 
 class disable_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_event.cpp

@@ -22,10 +22,11 @@ Comment: All event related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "GameEventMgr.h"
 #include "Chat.h"
+#include "GameEventMgr.h"
+#include "Language.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class event_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_gm.cpp

@@ -26,8 +26,10 @@ EndScriptData */
 #include "ObjectMgr.h"
 #include "Chat.h"
 #include "AccountMgr.h"
+#include "Language.h"
 #include "World.h"
 #include "Player.h"
+#include "Opcodes.h"
 
 class gm_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_go.cpp

@@ -27,6 +27,7 @@ EndScriptData */
 #include "MapManager.h"
 #include "TicketMgr.h"
 #include "Chat.h"
+#include "Language.h"
 #include "Player.h"
 
 class go_commandscript : public CommandScript

src/server/scripts/Commands/cs_gobject.cpp

@@ -28,7 +28,9 @@ EndScriptData */
 #include "PoolMgr.h"
 #include "MapManager.h"
 #include "Chat.h"
+#include "Language.h"
 #include "Player.h"
+#include "Opcodes.h"
 
 class gobject_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_guild.cpp

@@ -22,11 +22,13 @@ Comment: All guild related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
+#include "AchievementMgr.h"
 #include "Chat.h"
+#include "Language.h"
 #include "Guild.h"
 #include "GuildMgr.h"
 #include "ObjectAccessor.h"
+#include "ScriptMgr.h"
 
 class guild_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_honor.cpp

@@ -22,10 +22,11 @@ Comment: All honor related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
 #include "Chat.h"
+#include "Language.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class honor_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_learn.cpp

@@ -25,9 +25,11 @@ EndScriptData */
 #include "Chat.h"
 #include "ScriptMgr.h"
 #include "ObjectMgr.h"
+#include "Language.h"
 #include "SpellMgr.h"
 #include "SpellInfo.h"
 #include "Player.h"
+#include "Pet.h"
 
 class learn_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_lfg.cpp

@@ -17,6 +17,7 @@
 
 #include "ScriptMgr.h"
 #include "Chat.h"
+#include "Language.h"
 #include "LFGMgr.h"
 #include "Group.h"
 #include "Player.h"

src/server/scripts/Commands/cs_list.cpp

@@ -25,6 +25,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "Chat.h"
 #include "SpellAuraEffects.h"
+#include "Language.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Player.h"

src/server/scripts/Commands/cs_lookup.cpp

@@ -22,13 +22,15 @@ Comment: All lookup related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "Chat.h"
 #include "AccountMgr.h"
+#include "Chat.h"
 #include "GameEventMgr.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Player.h"
+#include "ReputationMgr.h"
+#include "ScriptMgr.h"
+#include "SpellInfo.h"
 
 class lookup_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_message.cpp

@@ -25,6 +25,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "Chat.h"
 #include "ChannelMgr.h"
+#include "Language.h"
 #include "Player.h"
 
 class message_commandscript : public CommandScript

src/server/scripts/Commands/cs_misc.cpp

@@ -23,13 +23,16 @@
 #include "GridNotifiers.h"
 #include "Group.h"
 #include "InstanceSaveMgr.h"
+#include "Language.h"
 #include "MovementGenerator.h"
 #include "ObjectAccessor.h"
+#include "Opcodes.h"
 #include "SpellAuras.h"
 #include "TargetedMovementGenerator.h"
 #include "WeatherMgr.h"
 #include "ace/INET_Addr.h"
 #include "Player.h"
+#include "Pet.h"
 
 class misc_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_modify.cpp

@@ -22,11 +22,15 @@ Comment: All modify related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
 #include "Chat.h"
 #include <stdlib.h>
+#include "ObjectMgr.h"
+#include "Opcodes.h"
+#include "Pet.h"
 #include "Player.h"
+#include "ReputationMgr.h"
+#include "ScriptMgr.h"
+
 
 class modify_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_npc.cpp

@@ -27,9 +27,11 @@ EndScriptData */
 #include "Chat.h"
 #include "Transport.h"
 #include "CreatureGroups.h"
+#include "Language.h"
 #include "TargetedMovementGenerator.h"                      // for HandleNpcUnFollowCommand
 #include "CreatureAI.h"
 #include "Player.h"
+#include "Pet.h"
 
 class npc_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_quest.cpp

@@ -22,10 +22,11 @@ Comment: All quest related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
 #include "Chat.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "ReputationMgr.h"
+#include "ScriptMgr.h"
 
 class quest_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_reload.cpp

@@ -22,21 +22,23 @@ Comment: All reload related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
-#include "SpellMgr.h"
-#include "TicketMgr.h"
-#include "MapManager.h"
-#include "DisableMgr.h"
-#include "LFGMgr.h"
+#include "AchievementMgr.h"
 #include "AuctionHouseMgr.h"
+#include "Chat.h"
 #include "CreatureTextMgr.h"
-#include "SmartAI.h"
+#include "DisableMgr.h"
+#include "Language.h"
+#include "LFGMgr.h"
+#include "MapManager.h"
+#include "ObjectMgr.h"
+#include "ScriptMgr.h"
 #include "SkillDiscovery.h"
 #include "SkillExtraItems.h"
-#include "Chat.h"
-#include "WaypointManager.h"
+#include "SmartAI.h"
+#include "SpellMgr.h"
+#include "TicketMgr.h"
 #include "WardenCheckMgr.h"
+#include "WaypointManager.h"
 
 class reload_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_reset.cpp

@@ -22,10 +22,13 @@ Comment: All reset related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
+#include "AchievementMgr.h"
 #include "Chat.h"
+#include "Language.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
+#include "Pet.h"
+#include "ScriptMgr.h"
 
 class reset_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_server.cpp

@@ -22,12 +22,13 @@ Comment: All server related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
 #include "Chat.h"
-#include "SystemConfig.h"
 #include "Config.h"
+#include "Language.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
+#include "ScriptMgr.h"
+#include "SystemConfig.h"
 
 class server_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_tele.cpp

@@ -22,12 +22,13 @@ Comment: All tele related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Chat.h"
 #include "Group.h"
+#include "Language.h"
+#include "MapManager.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class tele_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_ticket.cpp

@@ -22,12 +22,14 @@ Comment: All ticket related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "Chat.h"
 #include "AccountMgr.h"
+#include "Chat.h"
+#include "Language.h"
 #include "ObjectMgr.h"
-#include "TicketMgr.h"
+#include "Opcodes.h"
 #include "Player.h"
+#include "TicketMgr.h"
+#include "ScriptMgr.h"
 
 class ticket_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_titles.cpp

@@ -22,10 +22,11 @@ Comment: All titles related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
 #include "Chat.h"
+#include "Language.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 
 class titles_commandscript : public CommandScript
 {

src/server/scripts/Commands/cs_wp.cpp

@@ -22,11 +22,12 @@ Comment: All wp related commands
 Category: commandscripts
 EndScriptData */
 
-#include "ScriptMgr.h"
-#include "ObjectMgr.h"
-#include "WaypointManager.h"
 #include "Chat.h"
+#include "Language.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
+#include "WaypointManager.h"
 
 class wp_commandscript : public CommandScript
 {

src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp

@@ -21,6 +21,7 @@
 #include "ScriptedGossip.h"
 #include "blackrock_depths.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 //go_shadowforge_brazier
 class go_shadowforge_brazier : public GameObjectScript

src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp

@@ -273,7 +273,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {
@@ -298,7 +298,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 data)
+        uint64 GetData64(uint32 data) const
         {
             switch (data)
             {

src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp

@@ -222,7 +222,7 @@ public:
             }
         }
 
-        uint64 GetData64(uint32 type)
+        uint64 GetData64(uint32 type) const
         {
             switch (type)
             {

src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp

@@ -28,6 +28,7 @@ EndScriptData */
 #include "deadmines.h"
 #include "Spell.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*#####
 # item_Defias_Gunpowder

src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp

@@ -27,6 +27,8 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "deadmines.h"
 #include "TemporarySummon.h"
+#include "WorldPacket.h"
+#include "Opcodes.h"
 
 enum Sounds
 {
@@ -214,7 +216,7 @@ class instance_deadmines : public InstanceMapScript
                 }
             }
 
-            uint32 GetData(uint32 type)
+            uint32 GetData(uint32 type) const
             {
                 switch (type)
                 {
@@ -225,7 +227,7 @@ class instance_deadmines : public InstanceMapScript
                 return 0;
             }
 
-            uint64 GetData64(uint32 data)
+            uint64 GetData64(uint32 data) const
             {
                 switch (data)
                 {
@@ -238,16 +240,7 @@ class instance_deadmines : public InstanceMapScript
 
             void DoPlaySound(GameObject* unit, uint32 sound)
             {
-                WorldPacket data;
-                data.SetOpcode(SMSG_PLAY_SOUND);
-                data << uint32(sound);
-                unit->SendMessageToSet(&data, false);
-            }
-
-            void DoPlaySoundCreature(Unit* unit, uint32 sound)
-            {
-                WorldPacket data;
-                data.SetOpcode(SMSG_PLAY_SOUND);
+                WorldPacket data(SMSG_PLAY_SOUND, 4);
                 data << uint32(sound);
                 unit->SendMessageToSet(&data, false);
             }

src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp

@@ -114,7 +114,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 uiType)
+        uint32 GetData(uint32 uiType) const
         {
             switch (uiType)
             {
@@ -123,7 +123,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 uiType)
+        uint64 GetData64(uint32 uiType) const
         {
             switch (uiType)
             {

src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp

@@ -25,6 +25,7 @@ EndScriptData */
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellInfo.h"
 
 #define SAY_MIDNIGHT_KILL           -1532000
 #define SAY_APPEAR1                 -1532001

src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp

@@ -26,6 +26,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "karazhan.h"
+#include "SpellInfo.h"
 
 #define SAY_AGGRO           -1532091
 #define SAY_AXE_TOSS1       -1532092

src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp

@@ -27,6 +27,7 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "karazhan.h"
 #include "GameObject.h"
+#include "SpellInfo.h"
 
 #define SAY_AGGRO1                  -1532073
 #define SAY_AGGRO2                  -1532074

src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp

@@ -28,6 +28,7 @@ EndScriptData */
 #include "ScriptedGossip.h"
 #include "karazhan.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /***********************************/
 /*** OPERA WIZARD OF OZ EVENT *****/

src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp

@@ -241,7 +241,7 @@ public:
             return strSaveData;
         }
 
-        uint32 GetData(uint32 uiData)
+        uint32 GetData(uint32 uiData) const
         {
             switch (uiData)
             {
@@ -264,7 +264,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 uiData)
+        uint64 GetData64(uint32 uiData) const
         {
             switch (uiData)
             {

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -27,6 +27,7 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "magisters_terrace.h"
 #include "WorldPacket.h"
+#include "Opcodes.h"
 
 #define SAY_AGGRO                   -1585023                //This yell should be done when the room is cleared. For now, set it as a movelineofsight yell.
 #define SAY_PHOENIX                 -1585024

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp

@@ -75,6 +75,7 @@ public:
                 uint32 size = instance->GetData(DATA_FEL_CRYSTAL_SIZE);
                 for (uint8 i = 0; i < size; ++i)
                 {
+                    instance->SetData64(DATA_FEL_CRYSTAL, i);
                     uint64 guid = instance->GetData64(DATA_FEL_CRYSTAL);
                     sLog->outDebug(LOG_FILTER_TSCR, "Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
                     Crystals.push_back(guid);

src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp

@@ -72,8 +72,7 @@ public:
         uint32 Encounter[MAX_ENCOUNTER];
         uint32 DelrissaDeathCount;
 
-        std::list<uint64> FelCrystals;
-        std::list<uint64>::const_iterator CrystalItr;
+        std::vector<uint64> FelCrystals;
 
         uint64 SelinGUID;
         uint64 DelrissaGUID;
@@ -85,8 +84,7 @@ public:
         uint64 KaelStatue[2];
         uint64 EscapeOrbGUID;
         uint32 StatuesState;
-
-        bool InitializedItr;
+        uint8 felCristalIndex;
 
         void Initialize()
         {
@@ -107,8 +105,7 @@ public:
             KaelStatue[1] = 0;
             EscapeOrbGUID = 0;
             StatuesState = 0;
-
-            InitializedItr = false;
+            felCristalIndex = 0;
         }
 
         bool IsEncounterInProgress() const
@@ -119,7 +116,7 @@ public:
             return false;
         }
 
-        uint32 GetData(uint32 identifier)
+        uint32 GetData(uint32 identifier) const
         {
             switch (identifier)
             {
@@ -276,7 +273,7 @@ public:
             OUT_LOAD_INST_DATA_COMPLETE;
         }
             
-        uint64 GetData64(uint32 identifier)
+        uint64 GetData64(uint32 identifier) const
         {
             switch (identifier)
             {
@@ -297,26 +294,22 @@ public:
                 case DATA_ESCAPE_ORB:
                     return EscapeOrbGUID;
                 case DATA_FEL_CRYSTAL:
-                {
-                    if (FelCrystals.empty())
+                    if (FelCrystals.size() < felCristalIndex)
                     {
                         sLog->outError(LOG_FILTER_TSCR, "Magisters Terrace: No Fel Crystals loaded in Inst Data");
                         return 0;
                     }
 
-                    if (!InitializedItr)
-                    {
-                        CrystalItr = FelCrystals.begin();
-                        InitializedItr = true;
-                    }
-
-                    uint64 guid = *CrystalItr;
-                    ++CrystalItr;
-                    return guid;
-                }
+                    return FelCrystals.at(felCristalIndex);
             }
             return 0;
         }
+
+        void SetData64(uint32 identifier, uint64 value)
+        {
+            if (identifier == DATA_FEL_CRYSTAL)
+                felCristalIndex = value;
+        }
     };
 };
 

src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp

@@ -31,6 +31,7 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 ## npc_kalecgos

src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp

@@ -117,7 +117,7 @@ class instance_molten_core : public InstanceMapScript
                 }
             }
 
-            uint32 GetData(uint32 type)
+            uint32 GetData(uint32 type) const
             {
                 switch (type)
                 {
@@ -128,7 +128,7 @@ class instance_molten_core : public InstanceMapScript
                 return 0;
             }
 
-            uint64 GetData64(uint32 type)
+            uint64 GetData64(uint32 type) const
             {
                 switch (type)
                 {

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp

@@ -24,6 +24,7 @@
 #include "CombatAI.h"
 #include "PassiveAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 ##Quest 12848
@@ -308,7 +309,7 @@ public:
                 prisonerGUID = guid;
         }
 
-        uint64 GetGUID(int32 /*id*/)
+        uint64 GetGUID(int32 /*id*/) const
         {
             return prisonerGUID;
         }

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp

@@ -19,6 +19,7 @@
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 //How to win friends and influence enemies
 // texts signed for creature 28939 but used for 28939, 28940, 28610

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp

@@ -29,6 +29,7 @@ EndScriptData */
 #include "scarlet_monastery.h"
 #include "LFGMgr.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 //this texts are already used by 3975 and 3976
 enum Says

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp

@@ -26,6 +26,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "scarlet_monastery.h"
+#include "SpellInfo.h"
 
 enum Says
 {

src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp

@@ -132,7 +132,7 @@ public:
             }
         }
 
-        uint64 GetData64(uint32 type)
+        uint64 GetData64(uint32 type) const
         {
             switch (type)
             {
@@ -147,7 +147,7 @@ public:
             return 0;
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             if (type == TYPE_MOGRAINE_AND_WHITE_EVENT)
                 return encounter[0];

src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp

@@ -67,7 +67,10 @@ public:
                 instance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0);
 
                 if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
+                {
+                    instance->SetData(TYPE_GANDLING, IN_PROGRESS);
                     me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
             }
         }
 

src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp

@@ -67,7 +67,10 @@ public:
                 instance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0);
 
                 if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
+                {
+                    instance->SetData(TYPE_GANDLING, IN_PROGRESS);
                     me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
             }
         }
 

src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp

@@ -74,7 +74,10 @@ public:
                 instance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0);
 
                 if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
+                {
+                    instance->SetData(TYPE_GANDLING, IN_PROGRESS);
                     me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
             }
         }
 

src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp

@@ -63,7 +63,10 @@ public:
                 instance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0);
 
                 if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
+                {
+                    instance->SetData(TYPE_GANDLING, IN_PROGRESS);
                     me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
             }
         }
 

src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp

@@ -67,7 +67,10 @@ public:
                 instance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0);
 
                 if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
+                {
+                    instance->SetData(TYPE_GANDLING, IN_PROGRESS);
                     me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
             }
         }
 

src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp

@@ -69,7 +69,10 @@ public:
                 instance->SetData(DATA_THERAVENIAN_DEATH, 0);
 
                 if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
+                {
+                    instance->SetData(TYPE_GANDLING, IN_PROGRESS);
                     me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
             }
         }
 

src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp

@@ -128,21 +128,14 @@ public:
             }
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
-            if (type == TYPE_GANDLING)
-            {
-                if (IsBossDied[0] && IsBossDied[1] && IsBossDied[2] && IsBossDied[3] && IsBossDied[4] && IsBossDied[5])
-                {
-                    m_auiEncounter[0] = IN_PROGRESS;
-                    return IN_PROGRESS;
-                }
-            }
-
-            return 0;
+            return (type == TYPE_GANDLING &&
+                IsBossDied[0] && IsBossDied[1] && IsBossDied[2] &&
+                IsBossDied[3] && IsBossDied[4] && IsBossDied[5])
+                ? IN_PROGRESS : 0;
         }
     };
-
 };
 
 void AddSC_instance_scholomance()

src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp

@@ -192,7 +192,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {

src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp

@@ -402,7 +402,7 @@ class instance_stratholme : public InstanceMapScript
                 OUT_LOAD_INST_DATA_COMPLETE;
             }
 
-            uint32 GetData(uint32 type)
+            uint32 GetData(uint32 type) const
             {
                   switch (type)
                   {
@@ -426,7 +426,7 @@ class instance_stratholme : public InstanceMapScript
                   return 0;
             }
 
-            uint64 GetData64(uint32 data)
+            uint64 GetData64(uint32 data) const
             {
                 switch (data)
                 {

src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp

@@ -35,6 +35,7 @@ EndContentData */
 #include "stratholme.h"
 #include "Group.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 ## go_gauntlet_gate (this is the _first_ of the gauntlet gates, two exist)

src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp

@@ -193,7 +193,7 @@ public:
                 State = data;
          }
 
-         uint32 GetData(uint32 type)
+         uint32 GetData(uint32 type) const
          {
             if (type == EVENT_STATE)
                 return State;

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp

@@ -24,6 +24,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "sunwell_plateau.h"
+#include "SpellInfo.h"
 
 enum Quotes
 {

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp

@@ -27,6 +27,7 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "sunwell_plateau.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 enum Yells
 {

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp

@@ -25,6 +25,7 @@ SDComment: all sounds, black hole effect triggers to often (46228)
 #include "ScriptedCreature.h"
 #include "sunwell_plateau.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 // Muru & Entropius's spells
 enum Spells

src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp

@@ -122,7 +122,7 @@ public:
             return false;
         }
 
-        Player* GetPlayerInMap()
+        Player const * GetPlayerInMap() const
         {
             Map::PlayerList const& players = instance->GetPlayers();
 
@@ -182,7 +182,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 id)
+        uint32 GetData(uint32 id) const
         {
             switch (id)
             {
@@ -196,7 +196,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 id)
+        uint64 GetData64(uint32 id) const
         {
             switch (id)
             {
@@ -215,8 +215,8 @@ public:
                 case DATA_ANVEENA:              return Anveena;
                 case DATA_KALECGOS_KJ:          return KalecgosKJ;
                 case DATA_PLAYER_GUID:
-                    Player* Target = GetPlayerInMap();
-                    return Target->GetGUID();
+                    Player const* target = GetPlayerInMap();
+                    return target ? target->GetGUID() : 0;
             }
             return 0;
         }

src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp

@@ -466,20 +466,27 @@ class instance_uldaman : public InstanceMapScript
                 }
             }
 
-            uint64 GetData64(uint32 identifier)
+            uint64 GetData64(uint32 identifier) const
             {
-                if (identifier == 0) return uiWhoWokeuiArchaedasGUID;
-                if (identifier == 1) return vVaultWalker[0];    // VaultWalker1
-                if (identifier == 2) return vVaultWalker[1];    // VaultWalker2
-                if (identifier == 3) return vVaultWalker[2];    // VaultWalker3
-                if (identifier == 4) return vVaultWalker[3];    // VaultWalker4
-
-                if (identifier == 5) return vEarthenGuardian[0];
-                if (identifier == 6) return vEarthenGuardian[1];
-                if (identifier == 7) return vEarthenGuardian[2];
-                if (identifier == 8) return vEarthenGuardian[3];
-                if (identifier == 9) return vEarthenGuardian[4];
-                if (identifier == 10) return vEarthenGuardian[5];
+                switch (identifier)
+                {
+                    case 0:
+                        return uiWhoWokeuiArchaedasGUID;
+                    case 1:
+                    case 2:
+                    case 3:
+                    case 4:
+                        return vVaultWalker.at(identifier);
+                    case 5:
+                    case 6:
+                    case 7:
+                    case 8:
+                    case 9:
+                    case 10:
+                        return vEarthenGuardian.at(identifier - 5);
+                    default:
+                        break;
+                }
 
                 return 0;
             } // end GetData64

src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp

@@ -26,7 +26,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "zulaman.h"
-//#include "spell.h"
+#include "SpellInfo.h"
 
 #define YELL_AGGRO "Get on your knees and bow to da fang and claw!"
 #define SOUND_AGGRO                    12020

src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp

@@ -25,6 +25,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "zulaman.h"
+#include "SpellInfo.h"
 
 //Speech
 const char* YELL_TRANSFORM_TO_LYNX = "Let me introduce to you my new bruddahs: fang and claw!";

src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp

@@ -27,6 +27,7 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "zulaman.h"
 #include "Player.h"
+#include "TemporarySummon.h"
 
 #define MAX_ENCOUNTER     6
 #define RAND_VENDOR    2
@@ -283,7 +284,7 @@ class instance_zulaman : public InstanceMapScript
                 }
             }
 
-            uint32 GetData(uint32 type)
+            uint32 GetData(uint32 type) const
             {
                 switch (type)
                 {

src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp

@@ -32,6 +32,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "zulaman.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 ## npc_forest_frog

src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp

@@ -109,7 +109,7 @@ class instance_zulgurub : public InstanceMapScript
                 }
             }
 
-            uint32 GetData(uint32 type)
+            uint32 GetData(uint32 type) const
             {
                 switch (type)
                 {
@@ -119,7 +119,7 @@ class instance_zulgurub : public InstanceMapScript
             }
             */
 
-            uint64 GetData64(uint32 type)
+            uint64 GetData64(uint32 type) const
             {
                 switch (type)
                 {
@@ -143,7 +143,6 @@ class instance_zulgurub : public InstanceMapScript
                         return grilekGUID;
                     default:
                         break;
-
                 }
 
                 return 0;
@@ -214,4 +213,4 @@ class instance_zulgurub : public InstanceMapScript
 void AddSC_instance_zulgurub()
 {
     new instance_zulgurub();
-}
+}

src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp

@@ -34,6 +34,7 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 class mobs_ghoul_flayer : public CreatureScript
 {

src/server/scripts/EasternKingdoms/ghostlands.cpp

@@ -33,6 +33,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*######
 ## npc_rathis_tomber

src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp

@@ -31,6 +31,8 @@ EndContentData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
+#include "Pet.h"
+#include "SpellInfo.h"
 
 /*######
 ## npc_converted_sentry

src/server/scripts/EasternKingdoms/silvermoon_city.cpp

@@ -30,6 +30,7 @@ EndContentData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*#######
 # npc_blood_knight_stillblade

src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp

@@ -30,6 +30,7 @@ EndContentData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 ## mob_yenniku

src/server/scripts/EasternKingdoms/western_plaguelands.cpp

@@ -35,6 +35,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*######
 ## npcs_dithers_and_arbington

src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp

@@ -212,7 +212,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {
@@ -233,7 +233,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 data)
+        uint64 GetData64(uint32 data) const
         {
             switch (data)
             {

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp

@@ -28,6 +28,9 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "hyjal_trash.h"
 #include "Player.h"
+#include "WorldPacket.h"
+#include "Opcodes.h"
+#include "WorldSession.h"
 
 enum Misc
 {
@@ -157,7 +160,7 @@ public:
             }
         }
 
-        uint64 GetData64(uint32 identifier)
+        uint64 GetData64(uint32 identifier) const
         {
             switch (identifier)
             {
@@ -294,7 +297,7 @@ public:
 
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {

src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp

@@ -22,6 +22,7 @@
 #include "ScriptedEscortAI.h"
 #include "PassiveAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 enum Says
 {

src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp

@@ -20,6 +20,8 @@
 #include "CreatureTextMgr.h"
 #include "culling_of_stratholme.h"
 #include "Player.h"
+#include "TemporarySummon.h"
+#include "SpellInfo.h"
 
 #define MAX_ENCOUNTER 5
 
@@ -196,7 +198,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
                     SaveToDB();
             }
 
-            uint32 GetData(uint32 type)
+            uint32 GetData(uint32 type) const
             {
                 switch (type)
                 {
@@ -216,7 +218,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
                 return 0;
             }
 
-            uint64 GetData64(uint32 identifier)
+            uint64 GetData64(uint32 identifier) const
             {
                 switch (identifier)
                 {

src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp

@@ -34,6 +34,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "dark_portal.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 #define SAY_ENTER               -1269020                    //where does this belong?
 #define SAY_INTRO               -1269021

src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp

@@ -27,6 +27,8 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "dark_portal.h"
 #include "Player.h"
+#include "TemporarySummon.h"
+#include "SpellInfo.h"
 
 #define MAX_ENCOUNTER              2
 
@@ -237,7 +239,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {
@@ -253,7 +255,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 data)
+        uint64 GetData64(uint32 data) const
         {
             if (data == DATA_MEDIVH)
                 return MedivhGUID;

src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp

@@ -203,7 +203,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 data)
+        uint32 GetData(uint32 data) const
         {
             switch (data)
             {
@@ -223,7 +223,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 data)
+        uint64 GetData64(uint32 data) const
         {
             switch (data)
             {

src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp

@@ -29,6 +29,7 @@ EndScriptData */
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "onyxias_lair.h"
+#include "TemporarySummon.h"
 
 class instance_onyxias_lair : public InstanceMapScript
 {
@@ -189,7 +190,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 Type)
+        uint32 GetData(uint32 Type) const
         {
             switch (Type)
             {
@@ -200,7 +201,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 Data)
+        uint64 GetData64(uint32 Data) const
         {
             switch (Data)
             {

src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp

@@ -19,6 +19,7 @@
 #include "InstanceScript.h"
 #include "razorfen_downs.h"
 #include "Player.h"
+#include "TemporarySummon.h"
 
 #define    MAX_ENCOUNTER  1
 
@@ -186,7 +187,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 uiType)
+        uint32 GetData(uint32 uiType) const
         {
             switch (uiType)
             {
@@ -197,7 +198,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 uiType)
+        uint64 GetData64(uint32 uiType) const
         {
             switch (uiType)
             {

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp

@@ -19,6 +19,9 @@
 #include "ScriptedCreature.h"
 #include "ruins_of_ahnqiraj.h"
 #include "Player.h"
+#include "SpellInfo.h"
+#include "WorldPacket.h"
+#include "Opcodes.h"
 
 enum Texts
 {
@@ -52,29 +55,29 @@ enum Events
     EVENT_STOMP             = 3
 };
 
-const uint8 NUM_CRYSTALS = 9;
+uint8 const NUM_CRYSTALS = 9;
 
 // You spin me right round, baby
 // right round like a record, baby
 // right round round round
 Position CrystalCoordinates[NUM_CRYSTALS] =
 {
-    { -9394.230469, 1951.808594, 85.97733, 0.0 },
-    { -9357.931641, 1930.596802, 85.556198, 0.0 },
-    { -9383.113281, 2011.042725, 85.556389, 0.0 },
-    { -9243.36, 1979.04, 85.556, 0.0 },
-    { -9281.68, 1886.66, 85.5558, 0.0 },
-    { -9241.8, 1806.39, 85.5557, 0.0 },
-    { -9366.78, 1781.76, 85.5561, 0.0 },
-    { -9430.37, 1786.86, 85.557, 0.0 },
-    { -9406.73, 1863.13, 85.5558, 0.0 }
+    { -9394.230469f, 1951.808594f, 85.97733f, 0.0f },
+    { -9357.931641f, 1930.596802f, 85.556198f, 0.0f },
+    { -9383.113281f, 2011.042725f, 85.556389f, 0.0f },
+    { -9243.36f, 1979.04f, 85.556f, 0.0f },
+    { -9281.68f, 1886.66f, 85.5558f, 0.0f },
+    { -9241.8f, 1806.39f, 85.5557f, 0.0f },
+    { -9366.78f, 1781.76f, 85.5561f, 0.0f },
+    { -9430.37f, 1786.86f, 85.557f, 0.0f },
+    { -9406.73f, 1863.13f, 85.5558f, 0.0f }
 };
 
 float RoomRadius = 165.0f;
-const uint8 NUM_TORNADOS = 5; // TODO: This number is completly random!
-const uint8 NUM_WEAKNESS = 5;
-const uint32 SpellWeakness[NUM_WEAKNESS] = { 25177, 25178, 25180, 25181, 25183 };
-const Position RoomCenter = { -9343.041992f, 1923.278198f, 85.555984f, 0.0 };
+uint8 const NUM_TORNADOS = 5; // TODO: This number is completly random!
+uint8 const NUM_WEAKNESS = 5;
+uint32 const SpellWeakness[NUM_WEAKNESS] = { 25177, 25178, 25180, 25181, 25183 };
+Position const RoomCenter = { -9343.041992f, 1923.278198f, 85.555984f, 0.0 };
 
 class boss_ossirian : public CreatureScript
 {
@@ -213,7 +216,7 @@ class boss_ossirian : public CreatureScript
                 }
             }
 
-            void UpdateAI(const uint32 diff)
+            void UpdateAI(uint32 const diff)
             {
                 if (!UpdateVictim())
                     return;
@@ -227,9 +230,7 @@ class boss_ossirian : public CreatureScript
                 bool ApplySupreme = true;
 
                 if (me->HasAura(SPELL_SUPREME))
-                {
                     ApplySupreme = false;
-                }
                 else
                 {
                     for (uint8 i = 0; i < NUM_WEAKNESS; ++i)
@@ -264,6 +265,8 @@ class boss_ossirian : public CreatureScript
                             DoCast(me, SPELL_STOMP);
                             events.ScheduleEvent(EVENT_STOMP, 30000);
                             break;
+                        default:
+                            break;
                     }
                 }
 
@@ -280,19 +283,15 @@ class boss_ossirian : public CreatureScript
 class go_ossirian_crystal : public GameObjectScript
 {
     public:
-        go_ossirian_crystal() : GameObjectScript("go_ossirian_crystal")
-        {
-        }
+        go_ossirian_crystal() : GameObjectScript("go_ossirian_crystal") { }
 
         bool OnGossipHello(Player* player, GameObject* /*go*/)
         {
             InstanceScript* Instance = player->GetInstanceScript();
-
             if (!Instance)
                 return false;
 
             Creature* Ossirian = player->FindNearestCreature(NPC_OSSIRIAN, 30.0f);
-
             if (!Ossirian || Instance->GetBossState(DATA_OSSIRIAN) != IN_PROGRESS)
                 return false;
 

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp

@@ -71,7 +71,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
                 return true;
             }
 
-            uint64 GetData64(uint32 type)
+            uint64 GetData64(uint32 type) const
             {
                 switch (type)
                 {

src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp

@@ -90,7 +90,7 @@ public:
             return false;
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {
@@ -118,7 +118,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 identifier)
+        uint64 GetData64(uint32 identifier) const
         {
             switch (identifier)
             {

src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp

@@ -80,7 +80,7 @@ public:
             if (data == DONE)SaveToDB();
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {
@@ -98,7 +98,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 data)
+        uint64 GetData64(uint32 data) const
         {
             if (data == DATA_NARALEX)return NaralexGUID;
             return 0;

src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp

@@ -26,6 +26,7 @@ EndScriptData */
 /* ContentData
 EndContentData */
 
+#include "AchievementMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"

src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp

@@ -19,6 +19,7 @@
 #include "InstanceScript.h"
 #include "zulfarrak.h"
 #include "Player.h"
+#include "TemporarySummon.h"
 
 #define NPC_GAHZRILLA 7273
 #define PATH_ADDS 81553
@@ -180,7 +181,7 @@ public:
             }
         }
 
-        uint32 GetData(uint32 type)
+        uint32 GetData(uint32 type) const
         {
             switch (type)
             {
@@ -190,7 +191,7 @@ public:
             return 0;
         }
 
-        uint64 GetData64(uint32 data)
+        uint64 GetData64(uint32 data) const
         {
             switch (data)
             {

src/server/scripts/Kalimdor/azshara.cpp

@@ -30,6 +30,8 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "SpellInfo.h"
+#include "WorldSession.h"
 
 void AddSC_azshara()
 {

src/server/scripts/Kalimdor/darkshore.cpp

@@ -32,6 +32,7 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 void AddSC_darkshore()
 {

src/server/scripts/Kalimdor/desolace.cpp

@@ -33,6 +33,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 enum DyingKodo
 {

src/server/scripts/Kalimdor/dustwallow_marsh.cpp

@@ -34,6 +34,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*######
 ## npc_stinky

src/server/scripts/Kalimdor/feralas.cpp

@@ -29,6 +29,7 @@ EndScriptData */
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 void AddSC_feralas()
 {

src/server/scripts/Kalimdor/moonglade.cpp

@@ -32,6 +32,7 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*####
 # npc_omen

src/server/scripts/Kalimdor/mulgore.cpp

@@ -32,6 +32,7 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 # npc_skorn_whitecloud