diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-05 20:09:48 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-05 20:09:48 +0100 |
| commit | cc281616704abbfba9c065e26eeb3395d9fc1152 (patch) | |
| tree | ec78700b135507b8988d1837e261ce40a6c51cf6 /src/server/game/Handlers/BattleGroundHandler.cpp | |
| parent | 7da92908b8e176248db4d87217f0adf48318fd15 (diff) | |
| parent | ca440756a8e7eba24e7f9e304ca00347123af2fa (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'src/server/game/Handlers/BattleGroundHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/BattleGroundHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 9bbb5434040..9a67c37d709 100755 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -535,7 +535,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recvData) sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player %s (%u) joined battle for bg %u, bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetInstanceID(), bg->GetTypeID(), bgQueueTypeId); break; case 0: // leave queue - if (bg->GetStatus() != STATUS_WAIT_QUEUE) + if (bg->isArena() && bg->GetStatus() != STATUS_WAIT_QUEUE) return; // if player leaves rated arena match before match start, it is counted as he played but he lost |