diff options
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 49f41bf7856..4f7bf3a1338 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3416,8 +3416,6 @@ void BattlegroundMap::InitScriptData() else _battlegroundScript = std::make_unique<BattlegroundScript>(this); } - - _battlegroundScript->OnInit(); } TransferAbortParams BattlegroundMap::CannotEnter(Player* player) diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index f3fefda4c94..4332c5a52e2 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -18,6 +18,7 @@ #include "MapManager.h" #include "BattlefieldMgr.h" #include "Battleground.h" +#include "BattlegroundScript.h" #include "CharacterCache.h" #include "Containers.h" #include "DatabaseEnv.h" @@ -33,6 +34,7 @@ #include "ScriptMgr.h" #include "World.h" #include "WorldStateMgr.h" + #include <boost/dynamic_bitset.hpp> #include <numeric> @@ -131,6 +133,7 @@ BattlegroundMap* MapManager::CreateBattleground(uint32 mapId, uint32 instanceId, bg->SetBgMap(map); map->InitScriptData(); map->InitSpawnGroupState(); + map->GetBattlegroundScript()->OnInit(); if (sWorld->getBoolConfig(CONFIG_BATTLEGROUNDMAP_LOAD_GRIDS)) map->LoadAllCells(); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index bc6c15d525b..389b5930b99 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1211,7 +1211,11 @@ enum TrinityStrings LANG_OPVP_ZM_GOSSIP_ALLIANCE = 10054, LANG_OPVP_ZM_GOSSIP_HORDE = 10055, - // 10056-10066 - free + // Deephaul Ravine + LANG_BG_DR_CRYSTAL_TAKEN = 10056, + LANG_BG_DR_CRYSTAL_TAKEN_TUTORIAL = 10057, + + // 10058-10066 - free // Use for custom patches 11000-11999 LANG_AUTO_BROADCAST = 11000, |
