josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battlegrounds: Added sanity checks for bg scoreboard packet handler, should fix client crashes in AV, thx Timothy003 for research

Browse Source 
Closes issue #2165.

--HG--
branch : trunk
extra : rebase_source : b12e4ccf42d0d38064f1694242461eb0d9ad1605
This commit is contained in:
Shauren
2010-09-05 11:24:43 +02:00
parent 1608ebf7bf
commit 67c37b37cc
1 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/BattlegroundMgr.cpp
+77 -61
View File
@@ -239,139 +239,155 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket *data, Battleground *bg)
if (type) // arena if (type) // arena
{ {
// it seems this must be according to BG_WINNER_A/H and _NOT_ BG_TEAM_A/H // it seems this must be according to BG_WINNER_A/H and _NOT_ BG_TEAM_A/H
for (int i = 1; i >= 0; --i) for (int8 i = 1; i >= 0; --i)
{ {
uint32 pointsLost = bg->m_ArenaTeamRatingChanges[i] < 0 ? abs(bg->m_ArenaTeamRatingChanges[i]) : 0; uint32 pointsLost = bg->m_ArenaTeamRatingChanges[i] < 0 ? abs(bg->m_ArenaTeamRatingChanges[i]) : 0;
uint32 pointsGained = bg->m_ArenaTeamRatingChanges[i] > 0 ? bg->m_ArenaTeamRatingChanges[i] : 0; uint32 pointsGained = bg->m_ArenaTeamRatingChanges[i] > 0 ? bg->m_ArenaTeamRatingChanges[i] : 0;
uint32 MatchmakerRating = bg->m_ArenaTeamMMR[i]; uint32 MatchmakerRating = bg->m_ArenaTeamMMR[i];
*data << uint32(pointsLost); // Rating Lost *data << uint32(pointsLost); // Rating Lost
*data << uint32(pointsGained); // Rating gained *data << uint32(pointsGained); // Rating gained
*data << uint32(MatchmakerRating); // Matchmaking Value *data << uint32(MatchmakerRating); // Matchmaking Value
sLog.outDebug("rating change: %d", bg->m_ArenaTeamRatingChanges[i]); sLog.outDebug("rating change: %d", bg->m_ArenaTeamRatingChanges[i]);
} }
for (int i = 1; i >= 0; --i) for (int8 i = 1; i >= 0; --i)
{ {
uint32 at_id = bg->m_ArenaTeamIds[i]; uint32 at_id = bg->m_ArenaTeamIds[i];
ArenaTeam * at = sObjectMgr.GetArenaTeamById(at_id); ArenaTeam* at = sObjectMgr.GetArenaTeamById(at_id);
if (at) if (at)
*data << at->GetName(); *data << at->GetName();
else else
*data << (uint8)0; *data << uint8(0);
} }
} }
if (bg->GetStatus() != STATUS_WAIT_LEAVE) if (bg->GetStatus() != STATUS_WAIT_LEAVE)
{
*data << uint8(0); // bg not ended *data << uint8(0); // bg not ended
}
else else
{ {
*data << uint8(1); // bg ended *data << uint8(1); // bg ended
*data << uint8(bg->GetWinner()); // who win *data << uint8(bg->GetWinner()); // who win
} }
*data << (int32)(bg->GetPlayerScoresSize()); size_t wpos = data->wpos();
uint32 scoreCount = 0;
*data << uint32(scoreCount); // placeholder
for (Battleground::BattlegroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr) Battleground::BattlegroundScoreMap::const_iterator itr2 = bg->GetPlayerScoresBegin();
for (Battleground::BattlegroundScoreMap::const_iterator itr = itr2; itr != bg->GetPlayerScoresEnd();)
{ {
*data << (uint64)itr->first; itr2 = itr++;
*data << (int32)itr->second->KillingBlows; if (!bg->IsPlayerInBattleground(itr2->first))
{
sLog.outError("Player %llu has scoreboard entry for battleground %u but is not in battleground!", itr->first, bg->GetTypeID(true));
continue;
}
*data << uint64(itr2->first);
*data << uint32(itr2->second->KillingBlows);
if (type == 0) if (type == 0)
{ {
*data << (int32)itr->second->HonorableKills; *data << uint32(itr2->second->HonorableKills);
*data << (int32)itr->second->Deaths; *data << uint32(itr2->second->Deaths);
*data << (int32)(itr->second->BonusHonor); *data << uint32(itr2->second->BonusHonor);
} }
else else
{ {
Player *plr = sObjectMgr.GetPlayer(itr->first); Player *plr = sObjectMgr.GetPlayer(itr2->first);
uint32 team = bg->GetPlayerTeam(itr->first); uint32 team = bg->GetPlayerTeam(itr2->first);
if (!team && plr) if (!team && plr)
team = plr->GetBGTeam(); team = plr->GetBGTeam();
*data << uint8(team == ALLIANCE ? 1 : 0); // green or yellow *data << uint8(team == ALLIANCE ? 1 : 0); // green or yellow
} }
*data << (int32)itr->second->DamageDone; // damage done *data << uint32(itr2->second->DamageDone); // damage done
*data << (int32)itr->second->HealingDone; // healing done *data << uint32(itr2->second->HealingDone); // healing done
switch(bg->GetTypeID(true)) // battleground specific things switch(bg->GetTypeID(true)) // battleground specific things
{ {
case BATTLEGROUND_RB: case BATTLEGROUND_RB:
switch(bg->GetMapId()) switch(bg->GetMapId())
{ {
case 489: case 489:
*data << (uint32)0x00000002; // count of next fields *data << uint32(0x00000002); // count of next fields
*data << (uint32)((BattlegroundWGScore*)itr->second)->FlagCaptures; // flag captures *data << uint32(((BattlegroundWGScore*)itr2->second)->FlagCaptures); // flag captures
*data << (uint32)((BattlegroundWGScore*)itr->second)->FlagReturns; // flag returns *data << uint32(((BattlegroundWGScore*)itr2->second)->FlagReturns); // flag returns
break; break;
case 566: case 566:
*data << (uint32)0x00000001; // count of next fields *data << uint32(0x00000001); // count of next fields
*data << (uint32)((BattlegroundEYScore*)itr->second)->FlagCaptures; // flag captures *data << uint32(((BattlegroundEYScore*)itr2->second)->FlagCaptures); // flag captures
break; break;
case 529: case 529:
*data << (uint32)0x00000002; // count of next fields *data << uint32(0x00000002); // count of next fields
*data << (uint32)((BattlegroundABScore*)itr->second)->BasesAssaulted; // bases asssulted *data << uint32(((BattlegroundABScore*)itr2->second)->BasesAssaulted); // bases asssulted
*data << (uint32)((BattlegroundABScore*)itr->second)->BasesDefended; // bases defended *data << uint32(((BattlegroundABScore*)itr2->second)->BasesDefended); // bases defended
break; break;
case 30: case 30:
*data << (uint32)0x00000005; // count of next fields *data << uint32(0x00000005); // count of next fields
*data << (uint32)((BattlegroundAVScore*)itr->second)->GraveyardsAssaulted; // GraveyardsAssaulted *data << uint32(((BattlegroundAVScore*)itr2->second)->GraveyardsAssaulted); // GraveyardsAssaulted
*data << (uint32)((BattlegroundAVScore*)itr->second)->GraveyardsDefended; // GraveyardsDefended *data << uint32(((BattlegroundAVScore*)itr2->second)->GraveyardsDefended); // GraveyardsDefended
*data << (uint32)((BattlegroundAVScore*)itr->second)->TowersAssaulted; // TowersAssaulted *data << uint32(((BattlegroundAVScore*)itr2->second)->TowersAssaulted); // TowersAssaulted
*data << (uint32)((BattlegroundAVScore*)itr->second)->TowersDefended; // TowersDefended *data << uint32(((BattlegroundAVScore*)itr2->second)->TowersDefended); // TowersDefended
*data << (uint32)((BattlegroundAVScore*)itr->second)->MinesCaptured; // MinesCaptured *data << uint32(((BattlegroundAVScore*)itr2->second)->MinesCaptured); // MinesCaptured
break; break;
case 607: case 607:
*data << uint32(2); *data << uint32(0x00000002); // count of next fields
*data << uint32(((BattlegroundSAScore*)itr->second)->demolishers_destroyed); *data << uint32(((BattlegroundSAScore*)itr2->second)->demolishers_destroyed);
*data << uint32(((BattlegroundSAScore*)itr->second)->gates_destroyed); *data << uint32(((BattlegroundSAScore*)itr2->second)->gates_destroyed);
break; break;
default: default:
*data << (int32)0; // 0 *data << uint32(0);
break; break;
} }
case BATTLEGROUND_AV: case BATTLEGROUND_AV:
*data << (uint32)0x00000005; // count of next fields *data << uint32(0x00000005); // count of next fields
*data << (uint32)((BattlegroundAVScore*)itr->second)->GraveyardsAssaulted; // GraveyardsAssaulted *data << uint32(((BattlegroundAVScore*)itr2->second)->GraveyardsAssaulted); // GraveyardsAssaulted
*data << (uint32)((BattlegroundAVScore*)itr->second)->GraveyardsDefended; // GraveyardsDefended *data << uint32(((BattlegroundAVScore*)itr2->second)->GraveyardsDefended); // GraveyardsDefended
*data << (uint32)((BattlegroundAVScore*)itr->second)->TowersAssaulted; // TowersAssaulted *data << uint32(((BattlegroundAVScore*)itr2->second)->TowersAssaulted); // TowersAssaulted
*data << (uint32)((BattlegroundAVScore*)itr->second)->TowersDefended; // TowersDefended *data << uint32(((BattlegroundAVScore*)itr2->second)->TowersDefended); // TowersDefended
*data << (uint32)((BattlegroundAVScore*)itr->second)->MinesCaptured; // MinesCaptured *data << uint32(((BattlegroundAVScore*)itr2->second)->MinesCaptured); // MinesCaptured
break; break;
case BATTLEGROUND_WS: case BATTLEGROUND_WS:
*data << (uint32)0x00000002; // count of next fields *data << uint32(0x00000002); // count of next fields
*data << (uint32)((BattlegroundWGScore*)itr->second)->FlagCaptures; // flag captures *data << uint32(((BattlegroundWGScore*)itr2->second)->FlagCaptures); // flag captures
*data << (uint32)((BattlegroundWGScore*)itr->second)->FlagReturns; // flag returns *data << uint32(((BattlegroundWGScore*)itr2->second)->FlagReturns); // flag returns
break; break;
case BATTLEGROUND_AB: case BATTLEGROUND_AB:
*data << (uint32)0x00000002; // count of next fields *data << uint32(0x00000002); // count of next fields
*data << (uint32)((BattlegroundABScore*)itr->second)->BasesAssaulted; // bases asssulted *data << uint32(((BattlegroundABScore*)itr2->second)->BasesAssaulted); // bases asssulted
*data << (uint32)((BattlegroundABScore*)itr->second)->BasesDefended; // bases defended *data << uint32(((BattlegroundABScore*)itr2->second)->BasesDefended); // bases defended
break; break;
case BATTLEGROUND_EY: case BATTLEGROUND_EY:
*data << (uint32)0x00000001; // count of next fields *data << uint32(0x00000001); // count of next fields
*data << (uint32)((BattlegroundEYScore*)itr->second)->FlagCaptures; // flag captures *data << uint32(((BattlegroundEYScore*)itr2->second)->FlagCaptures); // flag captures
break; break;
case BATTLEGROUND_NA: case BATTLEGROUND_NA:
case BATTLEGROUND_BE: case BATTLEGROUND_BE:
case BATTLEGROUND_AA: case BATTLEGROUND_AA:
case BATTLEGROUND_RL: case BATTLEGROUND_RL:
case BATTLEGROUND_SA: case BATTLEGROUND_SA:
*data << uint32(2); *data << uint32(0x00000002); // count of next fields
*data << uint32(((BattlegroundSAScore*)itr->second)->demolishers_destroyed); *data << uint32(((BattlegroundSAScore*)itr2->second)->demolishers_destroyed);
*data << uint32(((BattlegroundSAScore*)itr->second)->gates_destroyed); *data << uint32(((BattlegroundSAScore*)itr2->second)->gates_destroyed);
break; break;
case BATTLEGROUND_DS: // wotlk case BATTLEGROUND_DS: // wotlk
case BATTLEGROUND_RV: // wotlk case BATTLEGROUND_RV: // wotlk
case BATTLEGROUND_IC: // wotlk case BATTLEGROUND_IC: // wotlk
*data << (int32)0; // 0 *data << uint32(0);
break; break;
default: default:
sLog.outDebug("Unhandled MSG_PVP_LOG_DATA for BG id %u", bg->GetTypeID()); sLog.outDebug("Unhandled MSG_PVP_LOG_DATA for BG id %u", bg->GetTypeID());
*data << (int32)0; *data << uint32(0);
break; break;
} }
// should never happen
if (++scoreCount >= bg->GetMaxPlayers() && itr != bg->GetPlayerScoresEnd())
{
sLog.outError("Battleground %u scoreboard has more entries (%u) than allowed players in this bg (%u)", bg->GetTypeID(true), bg->GetPlayerScoresSize(), bg->GetMaxPlayers());
break;
}
} }
data->put(wpos, scoreCount);
} }
void BattlegroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket *data, GroupJoinBattlegroundResult result) void BattlegroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket *data, GroupJoinBattlegroundResult result)