Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/cs_solo3v3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,19 @@ class CommandJoinSolo : public CommandScript

handler->PSendSysMessage("{}", s.str().c_str());

for (ArenaTeam::MemberList::const_iterator itr = at->GetMembers().begin();
itr != at->GetMembers().end(); ++itr)
{
if (itr->Guid == player->GetGUID())
{
handler->PSendSysMessage("Solo MMR: {}", itr->MatchMakerRating);
break;
}
}
// Query MMR from database
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_MATCH_MAKER_RATING);
stmt->SetData(0, player->GetGUID().GetCounter());
stmt->SetData(1, ARENA_SLOT_SOLO_3v3);
PreparedQueryResult result = CharacterDatabase.Query(stmt);

uint16 matchMakerRating;
if (result)
matchMakerRating = (*result)[0].Get<uint16>();
else
matchMakerRating = sWorld->getIntConfig(CONFIG_ARENA_START_MATCHMAKER_RATING);

handler->PSendSysMessage("Solo MMR: {}", matchMakerRating);

return true;
}
Expand Down
27 changes: 14 additions & 13 deletions src/solo3v3_sc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -379,18 +379,19 @@ bool NpcSolo3v3::OnGossipSelect(Player* player, Creature* creature, uint32 /*sen
ChatHandler(player->GetSession()).PSendSysMessage("{}", s.str().c_str());
CloseGossipMenuFor(player);

ArenaTeam::MemberList::iterator itr;
for (itr = at->GetMembers().begin(); itr != at->GetMembers().end(); ++itr)
{
if (itr->Guid == player->GetGUID())
{
std::stringstream s;
s << "\nSolo MMR: " << itr->MatchMakerRating;
// Query MMR from database
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_MATCH_MAKER_RATING);
stmt->SetData(0, player->GetGUID().GetCounter());
stmt->SetData(1, ARENA_SLOT_SOLO_3v3);
PreparedQueryResult result = CharacterDatabase.Query(stmt);

uint16 matchMakerRating;
if (result)
matchMakerRating = (*result)[0].Get<uint16>();
else
matchMakerRating = sWorld->getIntConfig(CONFIG_ARENA_START_MATCHMAKER_RATING);

ChatHandler(player->GetSession()).PSendSysMessage("{}", s.str().c_str());
break;
}
}
ChatHandler(player->GetSession()).PSendSysMessage("Solo MMR: {}", matchMakerRating);
}

return true;
Expand Down Expand Up @@ -1011,7 +1012,7 @@ void PlayerScript3v3Arena::OnPlayerGetArenaPersonalRating(Player* player, uint8
{
if (slot == ARENA_SLOT_SOLO_3v3)
{
if (ArenaTeam* at = sArenaTeamMgr->GetArenaTeamByCaptain(player->GetGUID(), ARENA_TYPE_3v3_SOLO))
if (ArenaTeam* at = sArenaTeamMgr->GetArenaTeamById(player->GetArenaTeamId(ARENA_SLOT_SOLO_3v3)))
{
rating = at->GetRating();
}
Expand All @@ -1027,7 +1028,7 @@ void PlayerScript3v3Arena::OnPlayerGetMaxPersonalArenaRatingRequirement(const Pl

if (minslot < 6)
{
if (ArenaTeam* at = sArenaTeamMgr->GetArenaTeamByCaptain(player->GetGUID(), ARENA_TYPE_3v3_SOLO))
if (ArenaTeam* at = sArenaTeamMgr->GetArenaTeamById(player->GetArenaTeamId(ARENA_SLOT_SOLO_3v3)))
{
maxArenaRating = std::max(at->GetRating(), maxArenaRating);
}
Expand Down