diff options
| author | kvipka <qvipka@gmail.com> | 2020-08-28 20:48:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 19:48:41 +0200 |
| commit | 5d2780c43c36b0ae1cc4ac2694bf6ec464d079c7 (patch) | |
| tree | aa5e5e3c597099145bbf6a01f89e583217cb297f /src/server/game/Maps/Map.h | |
| parent | b63f5b0d83174abfb1b74111514ec424f5efe748 (diff) | |
Scripts/InstanceScript: Fix an issue where LoadAllGrids would load creatures before TeamInInstance was properly set (PR #25340)
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 a6a4e53bc50..06c148cae00 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -916,7 +916,7 @@ enum InstanceResetMethod class TC_GAME_API InstanceMap : public Map { public: - InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent); + InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent, TeamId InstanceTeam); ~InstanceMap(); bool AddPlayerToMap(Player*) 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; }; class TC_GAME_API BattlegroundMap : public Map |