diff options
| author | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:01 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:01 +0100 |
| commit | ac0ff1fc9b4c409089bbcb0256bdbc2f5cc4a405 (patch) | |
| tree | 9e939bb2b427ba8ae3e4c5512a6fc9975469c31f /src/server/game/Battlegrounds/BattlegroundMgr.h | |
| parent | d268b81044707e15266eadb4ab49f176135d4c26 (diff) | |
| parent | 43d5fb5eaefeafb34bea10ff5c6a2878c6c14df1 (diff) | |
Merge branch 'dbc' of https://github.com/Intel/TrinityCore into Intel-dbc
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/Events/GameEventMgr.cpp
Diffstat (limited to 'src/server/game/Battlegrounds/BattlegroundMgr.h')
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index 9e330373685..c98502945f7 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -51,7 +51,7 @@ struct BattlegroundTemplate uint32 ScriptId; BattlemasterListEntry const* BattlemasterEntry; - bool IsArena() const { return BattlemasterEntry->type == MAP_ARENA; } + bool IsArena() const { return BattlemasterEntry->InstanceType == MAP_ARENA; } }; class BattlegroundMgr |