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

Core/Conditions: Add missing null checks for PlayerCondition

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/5bf9a016480c22278beec2620743a664ede3773f)
This commit is contained in:
hondacrx
2022-05-05 10:06:59 -04:00
parent 8abb8679db
commit fd9501dbe0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/ConditionManager.cs
+3 -3
View File
@@ -1998,7 +1998,7 @@ namespace Game
if ((uint)forcedRank > condition.MaxReputation) if ((uint)forcedRank > condition.MaxReputation)
return false; return false;
} }
else if ((uint)player.GetReputationRank(condition.MaxFactionID) > condition.MaxReputation) else if (CliDB.FactionStorage.HasRecord(condition.MaxReputation) && (uint)player.GetReputationRank(condition.MaxFactionID) > condition.MaxReputation)
return false; return false;
} }
else else
@@ -2009,7 +2009,7 @@ namespace Game
for (var i = 0; i < condition.MinFactionID.Length; ++i) for (var i = 0; i < condition.MinFactionID.Length; ++i)
{ {
if (condition.MinFactionID[i] != 0) if (CliDB.FactionStorage.HasRecord(condition.MinFactionID[i]))
{ {
ReputationRank forcedRank = player.GetReputationMgr().GetForcedRankIfAny(condition.MinFactionID[i]); ReputationRank forcedRank = player.GetReputationMgr().GetForcedRankIfAny(condition.MinFactionID[i]);
if (forcedRank != 0) if (forcedRank != 0)
@@ -2021,7 +2021,7 @@ namespace Game
ReputationRank forcedRank1 = player.GetReputationMgr().GetForcedRankIfAny(condition.MaxFactionID); ReputationRank forcedRank1 = player.GetReputationMgr().GetForcedRankIfAny(condition.MaxFactionID);
if (forcedRank1 != 0) if (forcedRank1 != 0)
results[3] = (uint)forcedRank1 <= condition.MaxReputation; results[3] = (uint)forcedRank1 <= condition.MaxReputation;
else else if (CliDB.FactionStorage.HasRecord(condition.MaxReputation))
results[3] = (uint)player.GetReputationRank(condition.MaxFactionID) <= condition.MaxReputation; results[3] = (uint)player.GetReputationRank(condition.MaxFactionID) <= condition.MaxReputation;
if (!PlayerConditionLogic(condition.ReputationLogic, results)) if (!PlayerConditionLogic(condition.ReputationLogic, results))