diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-04 23:01:06 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-04 23:01:06 +0100 |
| commit | 459454cbe498ab5b42f28b67c4f96fd0283baa9b (patch) | |
| tree | 0198174be3f39d03aace1834599ccb023b48f76f /src/server/game/Handlers/BattleGroundHandler.cpp | |
| parent | 5ee22a8006d2c6ba5995bee96b530a802d85fbc3 (diff) | |
| parent | ed6b58b17db7d00ee3ef5dd6f2cce50f72b8871f (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Handlers/BattleGroundHandler.cpp
Diffstat (limited to 'src/server/game/Handlers/BattleGroundHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/BattleGroundHandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 085b5181913..9bbb5434040 100755 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -535,6 +535,9 @@ 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) + return; + // if player leaves rated arena match before match start, it is counted as he played but he lost if (ginfo.IsRated && ginfo.IsInvitedToBGInstanceGUID) { |