diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-05 16:46:14 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-05 16:46:14 +0200 |
| commit | d25c2e7f5b6ac7bb79960037cc728a46450d5609 (patch) | |
| tree | a8d7f053a8d518423316e533958cdc79c714ab0d /src/server/game/Battlefield/BattlefieldMgr.cpp | |
| parent | 6514e21b7cd8ec3ef7c0c44653d99245b3f57012 (diff) | |
| parent | 458f5b9502da9f861ba729142dd63c3a98191ece (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Spells/SpellMgr.cpp
src/tools/map_extractor/loadlib.cpp
Diffstat (limited to 'src/server/game/Battlefield/BattlefieldMgr.cpp')
| -rw-r--r-- | src/server/game/Battlefield/BattlefieldMgr.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp index 28a72152e9d..53b3ce0a6d9 100644 --- a/src/server/game/Battlefield/BattlefieldMgr.cpp +++ b/src/server/game/Battlefield/BattlefieldMgr.cpp @@ -74,11 +74,12 @@ void BattlefieldMgr::HandlePlayerEnterZone(Player* player, uint32 zoneid) if (itr == m_BattlefieldMap.end()) return; - if (itr->second->HasPlayer(player) || !itr->second->IsEnabled()) + Battlefield* bf = itr->second; + if (bf->HasPlayer(player) || !bf->IsEnabled()) return; - itr->second->HandlePlayerEnterZone(player, zoneid); - TC_LOG_DEBUG(LOG_FILTER_BATTLEFIELD, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId()); + bf->HandlePlayerEnterZone(player, zoneid); + TC_LOG_DEBUG(LOG_FILTER_BATTLEFIELD, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), bf->GetTypeId()); } void BattlefieldMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneid) |