aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps
diff options
context:
space:
mode:
authorJason Dove <1695733+jasongdove@users.noreply.github.com>2025-07-08 22:26:37 +0000
committerGitHub <noreply@github.com>2025-07-09 00:26:37 +0200
commitc7f5696479bb85c8fc7ee0d9fdaeb92e2b32213f (patch)
tree5eb2e7ad82f88dd089a58aad31f54c996d9edba3 /src/server/game/Maps
parent04d44bd3a081fdf1b13ff20cd97a399f0fdfc477 (diff)
Core/Scenarios: Allow scripts to set instance scenario by id (#31104)
* add example at Stratholme service entrance
Diffstat (limited to 'src/server/game/Maps')
-rw-r--r--src/server/game/Maps/Map.cpp20
-rw-r--r--src/server/game/Maps/Map.h8
-rw-r--r--src/server/game/Maps/MapManager.cpp2
3 files changed, 23 insertions, 7 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 41d19ba4e4c..2382850e9f8 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2809,7 +2809,7 @@ template TC_GAME_API void Map::RemoveFromMap(Conversation*, bool);
InstanceMap::InstanceMap(uint32 id, time_t expiry, uint32 InstanceId, Difficulty SpawnMode, TeamId InstanceTeam, InstanceLock* instanceLock,
Optional<uint32> lfgDungeonsId)
: Map(id, expiry, InstanceId, SpawnMode),
- i_data(nullptr), i_script_id(0), i_scenario(nullptr), i_instanceLock(instanceLock), i_lfgDungeonsId(lfgDungeonsId)
+ i_data(nullptr), i_script_id(0), i_instanceLock(instanceLock), i_lfgDungeonsId(lfgDungeonsId)
{
//lets initialize visibility distance for dungeons
InstanceMap::InitVisibilityDistance();
@@ -2834,7 +2834,6 @@ InstanceMap::~InstanceMap()
i_instanceLock->SetInUse(false);
delete i_data;
- delete i_scenario;
}
void InstanceMap::InitVisibilityDistance()
@@ -3081,6 +3080,23 @@ std::string const& InstanceMap::GetScriptName() const
return sObjectMgr->GetScriptName(i_script_id);
}
+void InstanceMap::SetInstanceScenario(InstanceScenario* scenario)
+{
+ i_scenario.reset(); // sends exit packets to all players
+
+ if (scenario)
+ {
+ i_scenario.reset(scenario);
+
+ scenario->LoadInstanceData();
+
+ DoOnPlayers([scenario](Player* player)
+ {
+ scenario->OnPlayerEnter(player);
+ });
+ }
+}
+
void InstanceMap::UpdateInstanceLock(UpdateBossStateSaveDataEvent const& updateSaveDataEvent)
{
if (i_instanceLock)
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index f16d95e5687..af10a1850a8 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -904,9 +904,9 @@ class TC_GAME_API InstanceMap : public Map
std::string const& GetScriptName() const;
InstanceScript* GetInstanceScript() { return i_data; }
InstanceScript const* GetInstanceScript() const { return i_data; }
- InstanceScenario* GetInstanceScenario() { return i_scenario; }
- InstanceScenario const* GetInstanceScenario() const { return i_scenario; }
- void SetInstanceScenario(InstanceScenario* scenario) { i_scenario = scenario; }
+ InstanceScenario* GetInstanceScenario() { return i_scenario.get(); }
+ InstanceScenario const* GetInstanceScenario() const { return i_scenario.get(); }
+ void SetInstanceScenario(InstanceScenario* scenario);
InstanceLock const* GetInstanceLock() const { return i_instanceLock; }
void UpdateInstanceLock(UpdateBossStateSaveDataEvent const& updateSaveDataEvent);
void UpdateInstanceLock(UpdateAdditionalSaveDataEvent const& updateSaveDataEvent);
@@ -928,7 +928,7 @@ class TC_GAME_API InstanceMap : public Map
Optional<SystemTimePoint> i_instanceExpireEvent;
InstanceScript* i_data;
uint32 i_script_id;
- InstanceScenario* i_scenario;
+ std::unique_ptr<InstanceScenario> i_scenario;
InstanceLock* i_instanceLock;
GroupInstanceReference i_owningGroupRef;
Optional<uint32> i_lfgDungeonsId;
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 4332c5a52e2..7d06b19153e 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -114,7 +114,7 @@ InstanceMap* MapManager::CreateInstance(uint32 mapId, uint32 instanceId, Instanc
map->TrySetOwningGroup(group);
map->CreateInstanceData();
- map->SetInstanceScenario(sScenarioMgr->CreateInstanceScenario(map, team));
+ map->SetInstanceScenario(sScenarioMgr->CreateInstanceScenarioForTeam(map, team));
map->InitSpawnGroupState();
if (sWorld->getBoolConfig(CONFIG_INSTANCEMAP_LOAD_GRIDS))