1 files changed, 27 insertions, 12 deletions

diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 316d82db626..28dd675a1b4 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -167,7 +167,7 @@ void BattleGround::Update(uint32 diff)
         m_RemovedPlayers.clear();
     }
 
-    // remove offline players from bg after ~5 minutes
+    // remove offline players from bg after 5 minutes
     if(GetPlayersSize())
     {
         for(std::map<uint64, BattleGroundPlayer>::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
@@ -176,19 +176,18 @@ void BattleGround::Update(uint32 diff)
             itr->second.LastOnlineTime += diff;
 
             if(plr)
-                itr->second.LastOnlineTime = 0;   // update last online time
+                itr->second.LastOnlineTime = 0;                 // update last online time
             else
-                if(itr->second.LastOnlineTime >= MAX_OFFLINE_TIME)                   // 5 minutes
-                    m_RemovedPlayers[itr->first] = 1;       // add to remove list (BG)
+                if(itr->second.LastOnlineTime >= MAX_OFFLINE_TIME)
+                    m_RemovedPlayers[itr->first] = 1;           // add to remove list (BG)
         }
     }
 
-    //TODO: move this system to spell system and ressurect players correclt there!
     /*********************************************************/
     /***        BATTLEGROUND RESSURECTION SYSTEM           ***/
     /*********************************************************/
 
-    //this should be handled by spell system:
+    //this should be handled by spell system
     m_LastResurrectTime += diff;
     if (m_LastResurrectTime >= RESURRECTION_INTERVAL)
     {
@@ -327,16 +326,13 @@ void BattleGround::Update(uint32 diff)
             //remove preparation
             if( isArena() )
             {
-                //TODO : add arena sound (PlaySoundToAll(SOUND_ARENA_START);
+                //TODO : add arena sound PlaySoundToAll(SOUND_ARENA_START);
 
                 for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
                     if(Player *plr = objmgr.GetPlayer(itr->first))
                         plr->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION);
 
-                if(!GetPlayersCountByTeam(ALLIANCE) && GetPlayersCountByTeam(HORDE))
-                    EndBattleGround(HORDE);
-                else if(GetPlayersCountByTeam(ALLIANCE) && !GetPlayersCountByTeam(HORDE))
-                    EndBattleGround(ALLIANCE);
+                CheckArenaWinConditions();
             }
             else
             {
@@ -346,7 +342,7 @@ void BattleGround::Update(uint32 diff)
                 for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
                     if(Player* plr = objmgr.GetPlayer(itr->first))
                         plr->RemoveAurasDueToSpell(SPELL_PREPARATION);
-                //Announce BG starting:
+                //Announce BG starting
                 if( sWorld.getConfig(CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE) )
                 {
                     sWorld.SendWorldText(LANG_BG_STARTED_ANNOUNCE_WORLD, GetName(), GetMinLevel(), GetMaxLevel());
@@ -1112,6 +1108,17 @@ void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid,
     }
 }
 
+// This method should be called when player logs out from running battleground
+void BattleGround::EventPlayerLoggedOut(Player* player)
+{
+    if( GetStatus() == STATUS_IN_PROGRESS )
+    {
+        if( isBattleGround() )
+            EventPlayerDroppedFlag(player);
+        else
+            CheckArenaWinConditions();
+    }
+}
 
 /* This method should be called only once ... it adds pointer to queue */
 void BattleGround::AddToBGFreeSlotQueue()
@@ -1679,6 +1686,14 @@ void BattleGround::HandleKillUnit(Creature *creature, Player *killer)
 {
 }
 
+void BattleGround::CheckArenaWinConditions()
+{
+    if( !GetAlivePlayersCountByTeam(ALLIANCE) && GetPlayersCountByTeam(HORDE) )
+        EndBattleGround(HORDE);
+    else if( GetPlayersCountByTeam(ALLIANCE) && !GetAlivePlayersCountByTeam(HORDE) )
+        EndBattleGround(ALLIANCE);
+}
+
 void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid )
 {
     Group* &old_raid = TeamID == ALLIANCE ? m_BgRaids[BG_TEAM_ALLIANCE] : m_BgRaids[BG_TEAM_HORDE];