Merge branch 'master' into Playerbot

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp

@@ -20,7 +20,6 @@
 #include "InstanceScript.h"
 #include "Player.h"
 #include "SpellScriptLoader.h"
-#include "TemporarySummon.h"
 #include "WorldPacket.h"
 #include "ruby_sanctum.h"
 #include "SpellScript.h"

src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp

@@ -15,7 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CreatureScript.h"
 #include "InstanceMapScript.h"
 #include "Player.h"
 #include "ScriptedCreature.h"

src/server/scripts/Northrend/zone_borean_tundra.cpp

@@ -431,7 +431,7 @@ public:
 
                         case 6:
                             if (Player* player = GetPlayerForEscort())
-                                player->AreaExploredOrEventHappens(QUEST_ESCAPE_WINTERFIN_CAVERNS);
+                                player->GroupEventHappens(QUEST_ESCAPE_WINTERFIN_CAVERNS, me);
                             IntroPhase = 7;
                             IntroTimer = 2500;
                             break;