From 4994611582aeaef5ea231f176f516c66b8141acb Mon Sep 17 00:00:00 2001 From: Triply Date: Sat, 28 Feb 2009 09:55:17 +0100 Subject: [PATCH] [7359] Fixed crash when removing battleground from BGFreeSlotQueue. Fixed player will now drop a flag before he logs out, if he is in BG. Signed-off-by: Triply --- src/game/BattleGroundMgr.cpp | 5 ++++- src/game/WorldSession.cpp | 3 +++ src/shared/revision_nr.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index e5379bb64..457b36c70 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -644,8 +644,9 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve //battleground with free slot for player should be always in the beggining of the queue // maybe it would be better to create bgfreeslotqueue for each queue_id_based_on_level + bool continueAdding = true; BGFreeSlotQueueType::iterator itr, next; - for (itr = sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].begin(); itr != sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].end(); itr = next) + for (itr = sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].begin(); continueAdding && itr != sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].end(); itr = next) { next = itr; ++next; @@ -671,6 +672,8 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve if( !bg->HasFreeSlots() ) { + if( next == sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].end() ) + continueAdding = false; // remove BG from BGFreeSlotQueue bg->RemoveFromBGFreeSlotQueue(); } diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 9101711a9..73f622d6d 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -302,6 +302,9 @@ void WorldSession::LogoutPlayer(bool Save) _player->BuildPlayerRepop(); _player->RepopAtGraveyard(); } + //drop a flag if player is carrying it + if(BattleGround *bg = _player->GetBattleGround()) + bg->EventPlayerDroppedFlag(_player); ///- Teleport to home if the player is in an invalid instance if(!_player->m_InstanceValid && !_player->isGameMaster()) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6149e27cb..3f3a2957e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7358" + #define REVISION_NR "7359" #endif // __REVISION_NR_H__