diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-09 21:09:47 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-09 21:09:47 +0200 |
| commit | 79062dd5ae49ec0e22350eaf8c0c2ce66f9db22d (patch) | |
| tree | 0f2fdcd19b8541d82774c5b862b4c1448226c639 /src/server/game/World | |
| parent | c8eb69df10b36d19a77743a037e700b001c8ed77 (diff) | |
| parent | b78d0a1c6dc8a2275924746291f1c9edcca09b0b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
sql/base/auth_database.sql
src/server/game/Battlegrounds/Battleground.h
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/World/World.cpp
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d85c3515128..1bc22317d11 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1846,7 +1846,7 @@ void World::SetInitialWorldSettings() ///- Initialize Battlegrounds TC_LOG_INFO("server.loading", "Starting Battleground System"); - sBattlegroundMgr->CreateInitialBattlegrounds(); + sBattlegroundMgr->LoadBattlegroundTemplates(); ///- Initialize outdoor pvp TC_LOG_INFO("server.loading", "Starting Outdoor PvP System"); |