Core/Scenarios: Move map from InstanceScenario to base class

1 files changed, 5 insertions, 4 deletions

diff --git a/src/server/game/Scenarios/Scenario.cpp b/src/server/game/Scenarios/Scenario.cpp
index ddd519e27b2..db08c9a379d 100644
--- a/src/server/game/Scenarios/Scenario.cpp
+++ b/src/server/game/Scenarios/Scenario.cpp
@@ -23,7 +23,8 @@
 #include "ScenarioMgr.h"
 #include "ScenarioPackets.h"
 
-Scenario::Scenario(ScenarioData const* scenarioData) : _data(scenarioData), _currentstep(nullptr)
+Scenario::Scenario(Map* map, ScenarioData const* scenarioData) : _map(map), _data(scenarioData),
+    _currentstep(nullptr)
 {
     ASSERT(_data);
 
@@ -39,7 +40,7 @@ Scenario::Scenario(ScenarioData const* scenarioData) : _data(scenarioData), _cur
 Scenario::~Scenario()
 {
     for (ObjectGuid guid : _players)
-        if (Player* player = ObjectAccessor::FindPlayer(guid))
+        if (Player* player = ObjectAccessor::GetPlayer(_map, guid))
             SendBootPlayer(player);
 
     _players.clear();
@@ -55,7 +56,7 @@ void Scenario::CompleteStep(ScenarioStepEntry const* step)
 {
     if (Quest const* quest = sObjectMgr->GetQuestTemplate(step->RewardQuestID))
         for (ObjectGuid guid : _players)
-            if (Player* player = ObjectAccessor::FindPlayer(guid))
+            if (Player* player = ObjectAccessor::GetPlayer(_map, guid))
                 player->RewardQuest(quest, LootItemType::Item, 0, nullptr, false);
 
     if (step->IsBonusObjective())
@@ -215,7 +216,7 @@ bool Scenario::IsCompletedStep(ScenarioStepEntry const* step)
 void Scenario::SendPacket(WorldPacket const* data) const
 {
     for (ObjectGuid guid : _players)
-        if (Player* player = ObjectAccessor::FindPlayer(guid))
+        if (Player* player = ObjectAccessor::GetPlayer(_map, guid))
             player->SendDirectMessage(data);
 }