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

Core/Races: Really fix bug in racemasks.

Browse Source
This commit is contained in:
hondacrx
2021-01-25 13:06:53 -05:00
parent 3201b804fa
commit b25c1487b2
14 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/Condition.cs
+1 -1
View File
@@ -95,7 +95,7 @@ namespace Game.Conditions
break;
case ConditionTypes.Race:
if (unit != null)
condMeets = Convert.ToBoolean(unit.GetRaceMask() & ConditionValue1);
condMeets = Convert.ToBoolean(SharedConst.GetMaskForRace(unit.GetRace()) & ConditionValue1);
break;
case ConditionTypes.Gender:
if (player != null)
Source/Game/Conditions/ConditionManager.cs
+3 -3
View File
@@ -1242,9 +1242,9 @@ namespace Game
}
case ConditionTypes.Race:
{
if (Convert.ToBoolean(cond.ConditionValue1 & ~(ulong)RaceMask.AllPlayable))
if (Convert.ToBoolean(cond.ConditionValue1 & ~SharedConst.RaceMaskAllPlayable))
{
Log.outError(LogFilter.Sql, "{0} has non existing racemask ({1}), skipped.", cond.ToString(true), cond.ConditionValue1 & ~(ulong)RaceMask.AllPlayable);
Log.outError(LogFilter.Sql, "{0} has non existing racemask ({1}), skipped.", cond.ToString(true), cond.ConditionValue1 & ~SharedConst.RaceMaskAllPlayable);
return false;
}
break;
@@ -1752,7 +1752,7 @@ namespace Game
}
}
if (condition.RaceMask != 0 && !Convert.ToBoolean(player.GetRaceMask() & condition.RaceMask))
if (condition.RaceMask != 0 && !Convert.ToBoolean(SharedConst.GetMaskForRace(player.GetRace()) & condition.RaceMask))
return false;
if (condition.ClassMask != 0 && !Convert.ToBoolean(player.GetClassMask() & condition.ClassMask))