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

Core/Conditions: Allow NegativeCondition for references

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b860733822aebef4bd69d506d32e44c0de9f7789)
This commit is contained in:
Hondacrx
2024-11-10 22:40:01 -05:00
parent 5b05f9f260
commit 10574a5129
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/ConditionManager.cs
+5 -3
View File
@@ -84,7 +84,11 @@ namespace Game
var refe = ConditionStorage[ConditionSourceType.ReferenceCondition].LookupByKey(new ConditionId(condition.ReferenceId, 0, 0)); var refe = ConditionStorage[ConditionSourceType.ReferenceCondition].LookupByKey(new ConditionId(condition.ReferenceId, 0, 0));
if (refe != null) if (refe != null)
{ {
if (!IsObjectMeetToConditionList(sourceInfo, refe)) bool condMeets = IsObjectMeetToConditionList(sourceInfo, refe);
if (condition.NegativeCondition)
condMeets = !condMeets;
if (!condMeets)
elseGroupStore[condition.ElseGroup] = false; elseGroupStore[condition.ElseGroup] = false;
} }
else else
@@ -391,8 +395,6 @@ namespace Game
Log.outError(LogFilter.Sql, "Condition {0} {1} has useless data in value2 ({2})!", rowType, iSourceTypeOrReferenceId, cond.ConditionValue2); Log.outError(LogFilter.Sql, "Condition {0} {1} has useless data in value2 ({2})!", rowType, iSourceTypeOrReferenceId, cond.ConditionValue2);
if (cond.ConditionValue3 != 0) if (cond.ConditionValue3 != 0)
Log.outError(LogFilter.Sql, "Condition {0} {1} has useless data in value3 ({2})!", rowType, iSourceTypeOrReferenceId, cond.ConditionValue3); Log.outError(LogFilter.Sql, "Condition {0} {1} has useless data in value3 ({2})!", rowType, iSourceTypeOrReferenceId, cond.ConditionValue3);
if (cond.NegativeCondition)
Log.outError(LogFilter.Sql, "Condition {0} {1} has useless data in NegativeCondition ({2})!", rowType, iSourceTypeOrReferenceId, cond.NegativeCondition);
if (cond.SourceEntry != 0 && iSourceTypeOrReferenceId < 0) if (cond.SourceEntry != 0 && iSourceTypeOrReferenceId < 0)
Log.outError(LogFilter.Sql, "Condition {0} {1} has useless data in SourceEntry ({2})!", rowType, iSourceTypeOrReferenceId, cond.SourceEntry); Log.outError(LogFilter.Sql, "Condition {0} {1} has useless data in SourceEntry ({2})!", rowType, iSourceTypeOrReferenceId, cond.SourceEntry);
} }