Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battlegrounds: Remove duplicate info from GroupQueueInfo

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/58be6007fbfa45b7deb864ee09bd0c672f42a71d)
This commit is contained in:
hondacrx
2021-08-08 14:57:15 -04:00
parent ab6bd1e71f
commit 18d873e1ee
2 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleGrounds/BattleGroundQueue.cs
+20 -24
View File
@@ -57,16 +57,13 @@ namespace Game.BattleGrounds
} }
// add group or player (grp == null) to bg queue with the given leader and bg specifications // add group or player (grp == null) to bg queue with the given leader and bg specifications
public GroupQueueInfo AddGroup(Player leader, Group grp, BattlegroundTypeId BgTypeId, PvpDifficultyRecord bracketEntry, ArenaTypes ArenaType, bool isRated, bool isPremade, uint ArenaRating, uint MatchmakerRating, uint arenateamid = 0) public GroupQueueInfo AddGroup(Player leader, Group grp, PvpDifficultyRecord bracketEntry, bool isPremade, uint ArenaRating, uint MatchmakerRating, uint arenateamid = 0)
{ {
BattlegroundBracketId bracketId = bracketEntry.GetBracketId(); BattlegroundBracketId bracketId = bracketEntry.GetBracketId();
// create new ginfo // create new ginfo
GroupQueueInfo ginfo = new(); GroupQueueInfo ginfo = new();
ginfo.BgTypeId = BgTypeId;
ginfo.ArenaType = ArenaType;
ginfo.ArenaTeamId = arenateamid; ginfo.ArenaTeamId = arenateamid;
ginfo.IsRated = isRated;
ginfo.IsInvitedToBGInstanceGUID = 0; ginfo.IsInvitedToBGInstanceGUID = 0;
ginfo.JoinTime = GameTime.GetGameTimeMS(); ginfo.JoinTime = GameTime.GetGameTimeMS();
ginfo.RemoveInviteTime = 0; ginfo.RemoveInviteTime = 0;
@@ -80,20 +77,20 @@ namespace Game.BattleGrounds
//compute index (if group is premade or joined a rated match) to queues //compute index (if group is premade or joined a rated match) to queues
uint index = 0; uint index = 0;
if (!isRated && !isPremade) if (!m_queueId.Rated && !isPremade)
index += SharedConst.BGTeamsCount; index += SharedConst.BGTeamsCount;
if (ginfo.Team == Team.Horde) if (ginfo.Team == Team.Horde)
index++; index++;
Log.outDebug(LogFilter.Battleground, "Adding Group to BattlegroundQueue bgTypeId : {0}, bracket_id : {1}, index : {2}", BgTypeId, bracketId, index); Log.outDebug(LogFilter.Battleground, "Adding Group to BattlegroundQueue bgTypeId : {0}, bracket_id : {1}, index : {2}", m_queueId.BattlemasterListId, bracketId, index);
uint lastOnlineTime = GameTime.GetGameTimeMS(); uint lastOnlineTime = GameTime.GetGameTimeMS();
//announce world (this don't need mutex) //announce world (this don't need mutex)
if (isRated && WorldConfig.GetBoolValue(WorldCfg.ArenaQueueAnnouncerEnable)) if (m_queueId.Rated && WorldConfig.GetBoolValue(WorldCfg.ArenaQueueAnnouncerEnable))
{ {
ArenaTeam team = Global.ArenaTeamMgr.GetArenaTeamById(arenateamid); ArenaTeam team = Global.ArenaTeamMgr.GetArenaTeamById(arenateamid);
if (team != null) if (team != null)
Global.WorldMgr.SendWorldText( CypherStrings.ArenaQueueAnnounceWorldJoin, team.GetName(), ginfo.ArenaType, ginfo.ArenaType, ginfo.ArenaTeamRating); Global.WorldMgr.SendWorldText( CypherStrings.ArenaQueueAnnounceWorldJoin, team.GetName(), m_queueId.TeamSize, m_queueId.TeamSize, ginfo.ArenaTeamRating);
} }
//add players from group to ginfo //add players from group to ginfo
@@ -130,9 +127,9 @@ namespace Game.BattleGrounds
m_QueuedGroups[(int)bracketId][index].Add(ginfo); m_QueuedGroups[(int)bracketId][index].Add(ginfo);
//announce to world, this code needs mutex //announce to world, this code needs mutex
if (!isRated && !isPremade && WorldConfig.GetBoolValue(WorldCfg.BattlegroundQueueAnnouncerEnable)) if (!m_queueId.Rated && !isPremade && WorldConfig.GetBoolValue(WorldCfg.BattlegroundQueueAnnouncerEnable))
{ {
Battleground bg = Global.BattlegroundMgr.GetBattlegroundTemplate(ginfo.BgTypeId); Battleground bg = Global.BattlegroundMgr.GetBattlegroundTemplate((BattlegroundTypeId)m_queueId.BattlemasterListId);
if (bg) if (bg)
{ {
string bgName = bg.GetName(); string bgName = bg.GetName();
@@ -173,14 +170,14 @@ namespace Game.BattleGrounds
{ {
uint timeInQueue = Time.GetMSTimeDiff(ginfo.JoinTime, GameTime.GetGameTimeMS()); uint timeInQueue = Time.GetMSTimeDiff(ginfo.JoinTime, GameTime.GetGameTimeMS());
uint team_index = TeamId.Alliance; //default set to TeamIndex.Alliance - or non rated arenas! uint team_index = TeamId.Alliance; //default set to TeamIndex.Alliance - or non rated arenas!
if (ginfo.ArenaType == 0) if (m_queueId.TeamSize == 0)
{ {
if (ginfo.Team == Team.Horde) if (ginfo.Team == Team.Horde)
team_index = TeamId.Horde; team_index = TeamId.Horde;
} }
else else
{ {
if (ginfo.IsRated) if (m_queueId.Rated)
team_index = TeamId.Horde; //for rated arenas use TeamIndex.Horde team_index = TeamId.Horde; //for rated arenas use TeamIndex.Horde
} }
@@ -200,14 +197,14 @@ namespace Game.BattleGrounds
public uint GetAverageQueueWaitTime(GroupQueueInfo ginfo, BattlegroundBracketId bracket_id) public uint GetAverageQueueWaitTime(GroupQueueInfo ginfo, BattlegroundBracketId bracket_id)
{ {
uint team_index = TeamId.Alliance; //default set to TeamIndex.Alliance - or non rated arenas! uint team_index = TeamId.Alliance; //default set to TeamIndex.Alliance - or non rated arenas!
if (ginfo.ArenaType == 0) if (m_queueId.TeamSize == 0)
{ {
if (ginfo.Team == Team.Horde) if (ginfo.Team == Team.Horde)
team_index = TeamId.Horde; team_index = TeamId.Horde;
} }
else else
{ {
if (ginfo.IsRated) if (m_queueId.Rated)
team_index = TeamId.Horde; //for rated arenas use TeamIndex.Horde team_index = TeamId.Horde; //for rated arenas use TeamIndex.Horde
} }
//check if there is enought values(we always add values > 0) //check if there is enought values(we always add values > 0)
@@ -282,7 +279,7 @@ namespace Game.BattleGrounds
// if invited to bg, and should decrease invited count, then do it // if invited to bg, and should decrease invited count, then do it
if (decreaseInvitedCount && group.IsInvitedToBGInstanceGUID != 0) if (decreaseInvitedCount && group.IsInvitedToBGInstanceGUID != 0)
{ {
Battleground bg = Global.BattlegroundMgr.GetBattleground(group.IsInvitedToBGInstanceGUID, group.BgTypeId); Battleground bg = Global.BattlegroundMgr.GetBattleground(group.IsInvitedToBGInstanceGUID, (BattlegroundTypeId)m_queueId.BattlemasterListId);
if (bg) if (bg)
bg.DecreaseInvitedCount(group.Team); bg.DecreaseInvitedCount(group.Team);
} }
@@ -291,15 +288,15 @@ namespace Game.BattleGrounds
m_QueuedPlayers.Remove(guid); m_QueuedPlayers.Remove(guid);
// announce to world if arena team left queue for rated match, show only once // announce to world if arena team left queue for rated match, show only once
if (group.ArenaType != 0 && group.IsRated && group.Players.Empty() && WorldConfig.GetBoolValue(WorldCfg.ArenaQueueAnnouncerEnable)) if (m_queueId.TeamSize != 0 && m_queueId.Rated && group.Players.Empty() && WorldConfig.GetBoolValue(WorldCfg.ArenaQueueAnnouncerEnable))
{ {
ArenaTeam team = Global.ArenaTeamMgr.GetArenaTeamById(group.ArenaTeamId); ArenaTeam team = Global.ArenaTeamMgr.GetArenaTeamById(group.ArenaTeamId);
if (team != null) if (team != null)
Global.WorldMgr.SendWorldText( CypherStrings.ArenaQueueAnnounceWorldExit, team.GetName(), group.ArenaType, group.ArenaType, group.ArenaTeamRating); Global.WorldMgr.SendWorldText( CypherStrings.ArenaQueueAnnounceWorldExit, team.GetName(), m_queueId.TeamSize, m_queueId.TeamSize, group.ArenaTeamRating);
} }
// if player leaves queue and he is invited to rated arena match, then he have to lose // if player leaves queue and he is invited to rated arena match, then he have to lose
if (group.IsInvitedToBGInstanceGUID != 0 && group.IsRated && decreaseInvitedCount) if (group.IsInvitedToBGInstanceGUID != 0 && m_queueId.Rated && decreaseInvitedCount)
{ {
ArenaTeam at = Global.ArenaTeamMgr.GetArenaTeamById(group.ArenaTeamId); ArenaTeam at = Global.ArenaTeamMgr.GetArenaTeamById(group.ArenaTeamId);
if (at != null) if (at != null)
@@ -324,7 +321,7 @@ namespace Game.BattleGrounds
// if group wasn't empty, so it wasn't deleted, and player have left a rated // if group wasn't empty, so it wasn't deleted, and player have left a rated
// queue . everyone from the group should leave too // queue . everyone from the group should leave too
// don't remove recursively if already invited to bg! // don't remove recursively if already invited to bg!
if (group.IsInvitedToBGInstanceGUID == 0 && group.IsRated) if (group.IsInvitedToBGInstanceGUID == 0 && m_queueId.Rated)
{ {
// remove next player, this is recursive // remove next player, this is recursive
// first send removal information // first send removal information
@@ -409,7 +406,7 @@ namespace Game.BattleGrounds
player.SetInviteForBattlegroundQueueType(bgQueueTypeId, ginfo.IsInvitedToBGInstanceGUID); player.SetInviteForBattlegroundQueueType(bgQueueTypeId, ginfo.IsInvitedToBGInstanceGUID);
// create remind invite events // create remind invite events
BGQueueInviteEvent inviteEvent = new(player.GetGUID(), ginfo.IsInvitedToBGInstanceGUID, bgTypeId, ginfo.ArenaType, ginfo.RemoveInviteTime); BGQueueInviteEvent inviteEvent = new(player.GetGUID(), ginfo.IsInvitedToBGInstanceGUID, bgTypeId, (ArenaTypes)m_queueId.TeamSize, ginfo.RemoveInviteTime);
m_events.AddEvent(inviteEvent, m_events.CalculateTime(BattlegroundConst.InvitationRemindTime)); m_events.AddEvent(inviteEvent, m_events.CalculateTime(BattlegroundConst.InvitationRemindTime));
// create automatic remove events // create automatic remove events
BGQueueRemoveEvent removeEvent = new(player.GetGUID(), ginfo.IsInvitedToBGInstanceGUID, bgQueueTypeId, ginfo.RemoveInviteTime); BGQueueRemoveEvent removeEvent = new(player.GetGUID(), ginfo.IsInvitedToBGInstanceGUID, bgQueueTypeId, ginfo.RemoveInviteTime);
@@ -421,7 +418,7 @@ namespace Game.BattleGrounds
player.GetName(), player.GetGUID().ToString(), bg.GetInstanceID(), queueSlot, bg.GetTypeID()); player.GetName(), player.GetGUID().ToString(), bg.GetInstanceID(), queueSlot, bg.GetTypeID());
BattlefieldStatusNeedConfirmation battlefieldStatus; BattlefieldStatusNeedConfirmation battlefieldStatus;
Global.BattlegroundMgr.BuildBattlegroundStatusNeedConfirmation(out battlefieldStatus, bg, player, queueSlot, player.GetBattlegroundQueueJoinTime(bgQueueTypeId), BattlegroundConst.InviteAcceptWaitTime, ginfo.ArenaType); Global.BattlegroundMgr.BuildBattlegroundStatusNeedConfirmation(out battlefieldStatus, bg, player, queueSlot, player.GetBattlegroundQueueJoinTime(bgQueueTypeId), BattlegroundConst.InviteAcceptWaitTime, (ArenaTypes)m_queueId.TeamSize);
player.SendPacket(battlefieldStatus); player.SendPacket(battlefieldStatus);
} }
return true; return true;
@@ -966,6 +963,8 @@ namespace Game.BattleGrounds
} }
} }
public BattlegroundQueueTypeId GetQueueId() { return m_queueId; }
BattlegroundQueueTypeId m_queueId; BattlegroundQueueTypeId m_queueId;
Dictionary<ObjectGuid, PlayerQueueInfo> m_QueuedPlayers = new(); Dictionary<ObjectGuid, PlayerQueueInfo> m_QueuedPlayers = new();
@@ -1144,9 +1143,6 @@ namespace Game.BattleGrounds
{ {
public Dictionary<ObjectGuid, PlayerQueueInfo> Players = new(); // player queue info map public Dictionary<ObjectGuid, PlayerQueueInfo> Players = new(); // player queue info map
public Team Team; // Player team (ALLIANCE/HORDE) public Team Team; // Player team (ALLIANCE/HORDE)
public BattlegroundTypeId BgTypeId; // Battleground type id
public bool IsRated; // rated
public ArenaTypes ArenaType; // 2v2, 3v3, 5v5 or 0 when BG
public uint ArenaTeamId; // team id if rated match public uint ArenaTeamId; // team id if rated match
public uint JoinTime; // time when group was added public uint JoinTime; // time when group was added
public uint RemoveInviteTime; // time when we will remove invite for players in group public uint RemoveInviteTime; // time when we will remove invite for players in group
Source/Game/Handlers/BattleGroundHandler.cs
+8 -8
View File
@@ -153,12 +153,12 @@ namespace Game
return; return;
BattlegroundQueue bgQueue = Global.BattlegroundMgr.GetBattlegroundQueue(bgQueueTypeId); BattlegroundQueue bgQueue = Global.BattlegroundMgr.GetBattlegroundQueue(bgQueueTypeId);
GroupQueueInfo ginfo = bgQueue.AddGroup(GetPlayer(), null, bgTypeId, bracketEntry, 0, false, isPremade, 0, 0); GroupQueueInfo ginfo = bgQueue.AddGroup(GetPlayer(), null, bracketEntry, isPremade, 0, 0);
uint avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId()); uint avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId());
uint queueSlot = GetPlayer().AddBattlegroundQueueId(bgQueueTypeId); uint queueSlot = GetPlayer().AddBattlegroundQueueId(bgQueueTypeId);
Global.BattlegroundMgr.BuildBattlegroundStatusQueued(out BattlefieldStatusQueued battlefieldStatusQueued, bg, GetPlayer(), queueSlot, ginfo.JoinTime, bgQueueTypeId, avgTime, ginfo.ArenaType, false); Global.BattlegroundMgr.BuildBattlegroundStatusQueued(out BattlefieldStatusQueued battlefieldStatusQueued, bg, GetPlayer(), queueSlot, ginfo.JoinTime, bgQueueTypeId, avgTime, 0, false);
SendPacket(battlefieldStatusQueued); SendPacket(battlefieldStatusQueued);
Log.outDebug(LogFilter.Battleground, $"Battleground: player joined queue for bg queue {bgQueueTypeId}, {_player.GetGUID()}, NAME {_player.GetName()}"); Log.outDebug(LogFilter.Battleground, $"Battleground: player joined queue for bg queue {bgQueueTypeId}, {_player.GetGUID()}, NAME {_player.GetName()}");
@@ -179,7 +179,7 @@ namespace Game
if (err == 0) if (err == 0)
{ {
Log.outDebug(LogFilter.Battleground, "Battleground: the following players are joining as group:"); Log.outDebug(LogFilter.Battleground, "Battleground: the following players are joining as group:");
ginfo = bgQueue.AddGroup(GetPlayer(), grp, bgTypeId, bracketEntry, 0, false, isPremade, 0, 0); ginfo = bgQueue.AddGroup(GetPlayer(), grp, bracketEntry, isPremade, 0, 0);
avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId()); avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId());
} }
@@ -200,7 +200,7 @@ namespace Game
// add to queue // add to queue
uint queueSlot = member.AddBattlegroundQueueId(bgQueueTypeId); uint queueSlot = member.AddBattlegroundQueueId(bgQueueTypeId);
Global.BattlegroundMgr.BuildBattlegroundStatusQueued(out BattlefieldStatusQueued battlefieldStatusQueued, bg, member, queueSlot, ginfo.JoinTime, bgQueueTypeId, avgTime, ginfo.ArenaType, true); Global.BattlegroundMgr.BuildBattlegroundStatusQueued(out BattlefieldStatusQueued battlefieldStatusQueued, bg, member, queueSlot, ginfo.JoinTime, bgQueueTypeId, avgTime, 0, true);
member.SendPacket(battlefieldStatusQueued); member.SendPacket(battlefieldStatusQueued);
Log.outDebug(LogFilter.Battleground, $"Battleground: player joined queue for bg queue {bgQueueTypeId}, {member.GetGUID()}, NAME {member.GetName()}"); Log.outDebug(LogFilter.Battleground, $"Battleground: player joined queue for bg queue {bgQueueTypeId}, {member.GetGUID()}, NAME {member.GetName()}");
} }
@@ -305,7 +305,7 @@ namespace Game
return; return;
//some checks if player isn't cheating - it is not exactly cheating, but we cannot allow it //some checks if player isn't cheating - it is not exactly cheating, but we cannot allow it
if (battlefieldPort.AcceptedInvite && ginfo.ArenaType == 0) if (battlefieldPort.AcceptedInvite && bgQueue.GetQueueId().TeamSize == 0)
{ {
//if player is trying to enter Battleground(not arena!) and he has deserter debuff, we must just remove him from queue //if player is trying to enter Battleground(not arena!) and he has deserter debuff, we must just remove him from queue
if (!GetPlayer().CanJoinToBattleground(bg)) if (!GetPlayer().CanJoinToBattleground(bg))
@@ -374,7 +374,7 @@ namespace Game
else // leave queue else // leave queue
{ {
// if player leaves rated arena match before match start, it is counted as he played but he lost // if player leaves rated arena match before match start, it is counted as he played but he lost
if (ginfo.IsRated && ginfo.IsInvitedToBGInstanceGUID != 0) if (bgQueue.GetQueueId().Rated && ginfo.IsInvitedToBGInstanceGUID != 0)
{ {
ArenaTeam at = Global.ArenaTeamMgr.GetArenaTeamById((uint)ginfo.Team); ArenaTeam at = Global.ArenaTeamMgr.GetArenaTeamById((uint)ginfo.Team);
if (at != null) if (at != null)
@@ -391,7 +391,7 @@ namespace Game
GetPlayer().RemoveBattlegroundQueueId(bgQueueTypeId); // must be called this way, because if you move this call to queue.removeplayer, it causes bugs GetPlayer().RemoveBattlegroundQueueId(bgQueueTypeId); // must be called this way, because if you move this call to queue.removeplayer, it causes bugs
bgQueue.RemovePlayer(GetPlayer().GetGUID(), true); bgQueue.RemovePlayer(GetPlayer().GetGUID(), true);
// player left queue, we should update it - do not update Arena Queue // player left queue, we should update it - do not update Arena Queue
if (ginfo.ArenaType == 0) if (bgQueue.GetQueueId().TeamSize == 0)
Global.BattlegroundMgr.ScheduleQueueUpdate(ginfo.ArenaMatchmakerRating, bgQueueTypeId, bracketEntry.GetBracketId()); Global.BattlegroundMgr.ScheduleQueueUpdate(ginfo.ArenaMatchmakerRating, bgQueueTypeId, bracketEntry.GetBracketId());
Log.outDebug(LogFilter.Battleground, $"Battleground: player {_player.GetName()} ({_player.GetGUID()}) left queue for bgtype { bg.GetTypeID()}, queue {bgQueueTypeId}."); Log.outDebug(LogFilter.Battleground, $"Battleground: player {_player.GetName()} ({_player.GetGUID()}) left queue for bgtype { bg.GetTypeID()}, queue {bgQueueTypeId}.");
@@ -533,7 +533,7 @@ namespace Game
{ {
Log.outDebug(LogFilter.Battleground, "Battleground: arena team id {0}, leader {1} queued with matchmaker rating {2} for type {3}", GetPlayer().GetArenaTeamId(packet.TeamSizeIndex), GetPlayer().GetName(), matchmakerRating, arenatype); Log.outDebug(LogFilter.Battleground, "Battleground: arena team id {0}, leader {1} queued with matchmaker rating {2} for type {3}", GetPlayer().GetArenaTeamId(packet.TeamSizeIndex), GetPlayer().GetName(), matchmakerRating, arenatype);
ginfo = bgQueue.AddGroup(GetPlayer(), grp, bgTypeId, bracketEntry, arenatype, true, false, arenaRating, matchmakerRating, ateamId); ginfo = bgQueue.AddGroup(GetPlayer(), grp, bracketEntry, false, arenaRating, matchmakerRating, ateamId);
avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId()); avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId());
} }