diff options
| author | kvipka <qvipka@gmail.com> | 2020-08-28 20:48:41 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-04 12:05:36 +0100 |
| commit | 5a20f14a9920a16545d913fc8e444c161c2a92bb (patch) | |
| tree | 7d393f3d29b4443a5c2eeda10ec1f3db198b100d /src/server/game/Maps/Map.h | |
| parent | 94668343c6638e03c0c787580ed5527cdc6a1b07 (diff) | |
Scripts/InstanceScript: Fix an issue where LoadAllGrids would load creatures before TeamInInstance was properly set (PR #25340)
(cherry picked from commit 5d2780c43c36b0ae1cc4ac2694bf6ec464d079c7)
Diffstat (limited to 'src/server/game/Maps/Map.h')
| -rw-r--r-- | src/server/game/Maps/Map.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index d044190fd4f..0e8c2e611a4 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -913,7 +913,7 @@ enum InstanceResetMethod class TC_GAME_API InstanceMap : public Map { public: - InstanceMap(uint32 id, time_t, uint32 InstanceId, Difficulty SpawnMode, Map* _parent); + InstanceMap(uint32 id, time_t, uint32 InstanceId, Difficulty SpawnMode, Map* _parent, TeamId InstanceTeam); ~InstanceMap(); bool AddPlayerToMap(Player* player, bool initPlayer = true) override; void RemovePlayerFromMap(Player*, bool) override; @@ -938,6 +938,8 @@ class TC_GAME_API InstanceMap : public Map bool HasPermBoundPlayers() const; uint32 GetMaxPlayers() const; uint32 GetMaxResetDelay() const; + TeamId GetTeamIdInInstance() const { return i_script_team; } + Team GetTeamInInstance() const { return i_script_team == TEAM_ALLIANCE ? ALLIANCE : HORDE; } virtual void InitVisibilityDistance() override; @@ -947,6 +949,7 @@ class TC_GAME_API InstanceMap : public Map bool m_unloadWhenEmpty; InstanceScript* i_data; uint32 i_script_id; + TeamId i_script_team; InstanceScenario* i_scenario; }; |