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

Core/Spells: fix issues with delayed spells and auras

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f420a439f92d3504c1e2c8e33f5f50e5ee4fdaee)
This commit is contained in:
hondacrx
2021-09-09 13:44:56 -04:00
parent ab3bf08b60
commit 56a90ee5ca
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+9 -11
View File
@@ -2895,42 +2895,40 @@ namespace Game.Spells
// now recheck units targeting correctness (need before any effects apply to prevent adding immunity at first effect not allow apply second spell effect and similar cases)
{
Func<TargetInfo, bool> selectedCondition = target =>
List<TargetInfo> delayedTargets = new();
m_UniqueTargetInfo.RemoveAll(target =>
{
if (single_missile || target.TimeDelay <= offset)
{
target.TimeDelay = offset;
delayedTargets.Add(target);
return true;
}
else if (next_time == 0 || target.TimeDelay < next_time)
next_time = target.TimeDelay;
return false;
};
List<TargetInfo> delayedTargets = new();
delayedTargets.AddRange(m_UniqueTargetInfo.Where(selectedCondition));
m_UniqueTargetInfo.RemoveAll(new Predicate<TargetInfo>(selectedCondition));
});
DoProcessTargetContainer(delayedTargets);
}
// now recheck gameobject targeting correctness
{
Func<GOTargetInfo, bool> selectedCondition = goTarget =>
List<GOTargetInfo> delayedGOTargets = new();
m_UniqueGOTargetInfo.RemoveAll(goTarget =>
{
if (single_missile || goTarget.TimeDelay <= offset)
{
goTarget.TimeDelay = offset;
delayedGOTargets.Add(goTarget);
return true;
}
else if (next_time == 0 || goTarget.TimeDelay < next_time)
next_time = goTarget.TimeDelay;
return false;
};
});
List<GOTargetInfo> delayedTargets = new(m_UniqueGOTargetInfo.Where(selectedCondition));
m_UniqueGOTargetInfo.RemoveAll(new Predicate<GOTargetInfo>(selectedCondition));
DoProcessTargetContainer(delayedGOTargets);
}
FinishTargetProcessing();