Misc: missing changes after merge

1 files changed, 8 insertions, 8 deletions

diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp
index cdaa938e98a..c531e22bc20 100644
--- a/src/server/game/Battlefield/BattlefieldMgr.cpp
+++ b/src/server/game/Battlefield/BattlefieldMgr.cpp
@@ -123,20 +123,20 @@ Battlefield* BattlefieldMgr::GetBattlefieldByBattleId(uint32 battleId)
     return NULL;
 }
 
-ZoneScript* BattlefieldMgr::GetZoneScript(uint32 zoneId)
+Battlefield* BattlefieldMgr::GetBattlefieldByGUID(uint64 guid)
 {
-    BattlefieldMap::iterator itr = _battlefieldMap.find(zoneId);
-    if (itr != _battlefieldMap.end())
-        return itr->second;
+    for (BattlefieldSet::iterator itr = _battlefieldSet.begin(); itr != _battlefieldSet.end(); ++itr)
+        if ((*itr)->GetGUID() == guid)
+            return *itr;
 
     return NULL;
 }
 
-Battlefield* BattlefieldMgr::GetBattlefieldByGUID(uint64 guid)
+ZoneScript* BattlefieldMgr::GetZoneScript(uint32 zoneId)
 {
-    for (BattlefieldSet::iterator itr = _battlefieldSet.begin(); itr != _battlefieldSet.end(); ++itr)
-        if ((*itr)->GetGUID() == guid)
-            return (*itr);
+    BattlefieldMap::iterator itr = _battlefieldMap.find(zoneId);
+    if (itr != _battlefieldMap.end())
+        return itr->second;
 
     return NULL;
 }