diff options
author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-20 22:07:56 +0100 |
---|---|---|
committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-20 22:07:56 +0100 |
commit | 41822a8ed392357aed43e52135a51456b0a42f96 (patch) | |
tree | a358f6b3a69d5f928c331e7ccf56849281a956e3 /src/server/game/Battlegrounds/BattlegroundQueue.cpp | |
parent | 455da45d9c476214e1d5567f79c9f029719330be (diff) | |
parent | 69e81d46b16ab9172c0a0999e387a0fb7f0f939c (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.h
Diffstat (limited to 'src/server/game/Battlegrounds/BattlegroundQueue.cpp')
-rw-r--r-- | src/server/game/Battlegrounds/BattlegroundQueue.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 013c9352242..11df69b0d11 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -49,14 +49,12 @@ BattlegroundQueue::~BattlegroundQueue() { m_events.KillAllEvents(false); - m_QueuedPlayers.clear(); for (int i = 0; i < MAX_BATTLEGROUND_BRACKETS; ++i) { for (uint32 j = 0; j < BG_QUEUE_GROUP_TYPES_COUNT; ++j) { for (GroupsQueueType::iterator itr = m_QueuedGroups[i][j].begin(); itr!= m_QueuedGroups[i][j].end(); ++itr) delete (*itr); - m_QueuedGroups[i][j].clear(); } } } |