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

Core/Players: Fixed crashes when accessing ActivePlayerData::PvpInfo

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/55091ff4bcf4500d0ebe9701e6dc121f5e6a3bb2)
This commit is contained in:
hondacrx
2023-01-06 16:21:45 -05:00
parent 5a5feca121
commit b7e2c1d84a
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Achievements/CriteriaHandler.cs
+10 -10
View File
@@ -2880,11 +2880,11 @@ namespace Game.Achievements
if (pvpTier == null) if (pvpTier == null)
return false; return false;
if (pvpTier.BracketID >= referencePlayer.m_activePlayerData.PvpInfo.Size()) PVPInfo pvpInfo = referencePlayer.GetPvpInfoForBracket((byte)pvpTier.BracketID);
if (pvpInfo == null)
return false; return false;
var pvpInfo = referencePlayer.m_activePlayerData.PvpInfo[pvpTier.BracketID]; if (pvpTier.Id != pvpInfo.PvpTierID)
if (pvpTier.Id != pvpInfo.PvpTierID || pvpInfo.Disqualified)
return false; return false;
break; break;
} }
@@ -2918,10 +2918,10 @@ namespace Game.Achievements
} }
case ModifierTreeType.PlayerPvpTierInBracketEqualOrGreaterThan: // 239 case ModifierTreeType.PlayerPvpTierInBracketEqualOrGreaterThan: // 239
{ {
if (secondaryAsset >= referencePlayer.m_activePlayerData.PvpInfo.Size()) PVPInfo pvpInfo = referencePlayer.GetPvpInfoForBracket((byte)secondaryAsset);
if (pvpInfo == null)
return false; return false;
var pvpInfo = referencePlayer.m_activePlayerData.PvpInfo[secondaryAsset];
var pvpTier = CliDB.PvpTierStorage.LookupByKey(pvpInfo.PvpTierID); var pvpTier = CliDB.PvpTierStorage.LookupByKey(pvpInfo.PvpTierID);
if (pvpTier == null) if (pvpTier == null)
return false; return false;
@@ -3475,21 +3475,21 @@ namespace Game.Achievements
if (pvpTier == null) if (pvpTier == null)
return false; return false;
if (pvpTier.BracketID >= referencePlayer.m_activePlayerData.PvpInfo.Size()) PVPInfo pvpInfo = referencePlayer.GetPvpInfoForBracket((byte)pvpTier.BracketID);
if (pvpInfo == null)
return false; return false;
var pvpInfo = referencePlayer.m_activePlayerData.PvpInfo[pvpTier.BracketID]; if (pvpTier.Id != pvpInfo.WeeklyBestWinPvpTierID)
if (pvpTier.Id != pvpInfo.WeeklyBestWinPvpTierID || pvpInfo.Disqualified)
return false; return false;
break; break;
} }
case ModifierTreeType.PlayerBestWeeklyWinPvpTierInBracketEqualOrGreaterThan: // 325 case ModifierTreeType.PlayerBestWeeklyWinPvpTierInBracketEqualOrGreaterThan: // 325
{ {
if (secondaryAsset >= referencePlayer.m_activePlayerData.PvpInfo.Size()) PVPInfo pvpInfo = referencePlayer.GetPvpInfoForBracket((byte)secondaryAsset);
if (pvpInfo == null)
return false; return false;
var pvpInfo = referencePlayer.m_activePlayerData.PvpInfo[secondaryAsset];
var pvpTier = CliDB.PvpTierStorage.LookupByKey(pvpInfo.WeeklyBestWinPvpTierID); var pvpTier = CliDB.PvpTierStorage.LookupByKey(pvpInfo.WeeklyBestWinPvpTierID);
if (pvpTier == null) if (pvpTier == null)
return false; return false;
Source/Game/Entities/Player/Player.PvP.cs
+22 -3
View File
@@ -18,7 +18,6 @@
using Framework.Constants; using Framework.Constants;
using Framework.Database; using Framework.Database;
using Game.Arenas; using Game.Arenas;
using Game.BattleFields;
using Game.BattleGrounds; using Game.BattleGrounds;
using Game.Cache; using Game.Cache;
using Game.DataStorage; using Game.DataStorage;
@@ -753,10 +752,30 @@ namespace Game.Entities
} }
} }
public uint GetArenaTeamId(byte slot) { return 0; } public uint GetArenaTeamId(byte slot) { return 0; }
public uint GetArenaPersonalRating(byte slot) { return m_activePlayerData.PvpInfo[slot].Rating; }
public void SetArenaTeamIdInvited(uint ArenaTeamId) { m_ArenaTeamIdInvited = ArenaTeamId; } public void SetArenaTeamIdInvited(uint ArenaTeamId) { m_ArenaTeamIdInvited = ArenaTeamId; }
public uint GetArenaTeamIdInvited() { return m_ArenaTeamIdInvited; } public uint GetArenaTeamIdInvited() { return m_ArenaTeamIdInvited; }
public uint GetRBGPersonalRating() { return m_activePlayerData.PvpInfo[3].Rating; } public uint GetRBGPersonalRating() { return GetArenaPersonalRating(3); }
public uint GetArenaPersonalRating(byte slot)
{
PVPInfo pvpInfo = GetPvpInfoForBracket(slot);
if (pvpInfo != null)
return pvpInfo.Rating;
return 0;
}
public PVPInfo GetPvpInfoForBracket(byte bracket)
{
int index = m_activePlayerData.PvpInfo.FindIndexIf(pvpInfo =>
{
return pvpInfo.Bracket == bracket && !pvpInfo.Disqualified;
});
if (index >= 0)
return m_activePlayerData.PvpInfo[index];
return null;
}
//OutdoorPVP //OutdoorPVP
public bool IsOutdoorPvPActive() public bool IsOutdoorPvPActive()