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

Core/Entities: Extended SpawnMask to 64 bit

Browse Source
This commit is contained in:
hondacrx
2018-01-06 23:43:44 -05:00
parent ff338c6532
commit befc9fcae7
16 changed files with 95 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/Condition.cs
+1 -1
View File
@@ -278,7 +278,7 @@ namespace Game.Conditions
condMeets = player.HasTitle(ConditionValue1);
break;
case ConditionTypes.Spawnmask:
condMeets = Convert.ToBoolean((1 << (int)obj.GetMap().GetSpawnMode()) & ConditionValue1);
condMeets = Convert.ToBoolean((1ul << (int)obj.GetMap().GetSpawnMode()) & ConditionValue1);
break;
case ConditionTypes.UnitState:
if (unit != null)
Source/Game/Conditions/ConditionManager.cs
+2 -1
View File
@@ -1490,7 +1490,8 @@ namespace Game
}
case ConditionTypes.Spawnmask:
{
if (cond.ConditionValue1 > (uint)SpawnMask.RaidAll)
// @todo: ConditionValue need to be extended to uint64
if ((ulong)cond.ConditionValue1 > 1ul << (int)SpawnMask.RaidAll)
{
Log.outError(LogFilter.Sql, "{0} has non existing SpawnMask in value1 ({1}), skipped.", cond.ToString(true), cond.ConditionValue1);
return false;