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

Core/SmartAI: add missing movement generator type check on SmartAI::SetCombatMove

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e94dca132b4a505f3cc4583bd63879148ad51ca3)
This commit is contained in:
hondacrx
2022-01-01 16:17:58 -05:00
parent c0aad82cd1
commit a4c4897b4d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/SmartScripts/SmartAI.cs
+4 -1
View File
@@ -849,7 +849,10 @@ namespace Game.AI
{ {
if (on) if (on)
{ {
if (!me.HasReactState(ReactStates.Passive) && me.GetVictim() && !me.GetMotionMaster().HasMovementGenerator(movement => movement.Mode == MovementGeneratorMode.Default && movement.Priority == MovementGeneratorPriority.Normal)) if (!me.HasReactState(ReactStates.Passive) && me.GetVictim() && !me.GetMotionMaster().HasMovementGenerator(movement =>
{
return movement.GetMovementGeneratorType() == MovementGeneratorType.Chase && movement.Mode == MovementGeneratorMode.Default && movement.Priority == MovementGeneratorPriority.Normal;
}))
{ {
SetRun(_run); SetRun(_run);
me.GetMotionMaster().MoveChase(me.GetVictim()); me.GetMotionMaster().MoveChase(me.GetVictim());
Source/Game/AI/SmartScripts/SmartScript.cs
+2 -5
View File
@@ -452,9 +452,7 @@ namespace Game.AI
if (e.Action.cast.castFlags.HasAnyFlag((uint)SmartCastFlags.CombatMove)) if (e.Action.cast.castFlags.HasAnyFlag((uint)SmartCastFlags.CombatMove))
{ {
// If cast flag SMARTCAST_COMBAT_MOVE is set combat movement will not be allowed // If cast flag SMARTCAST_COMBAT_MOVE is set combat movement will not be allowed unless target is outside spell range, out of mana, or LOS.
// unless target is outside spell range, out of mana, or LOS.
bool allowMove = false; bool allowMove = false;
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(e.Action.cast.spell, _me.GetMap().GetDifficultyID()); SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(e.Action.cast.spell, _me.GetMap().GetDifficultyID());
var costs = spellInfo.CalcPowerCost(_me, spellInfo.GetSchoolMask()); var costs = spellInfo.CalcPowerCost(_me, spellInfo.GetSchoolMask());
@@ -479,8 +477,7 @@ namespace Game.AI
} }
} }
if (_me.GetDistance(target) > spellInfo.GetMaxRange(true) || if (_me.GetDistance(target) > spellInfo.GetMaxRange(true) || _me.GetDistance(target) < spellInfo.GetMinRange(true) ||
_me.GetDistance(target) < spellInfo.GetMinRange(true) ||
!_me.IsWithinLOSInMap(target) || !hasPower || _me.HasUnitFlag(UnitFlags.Silenced)) !_me.IsWithinLOSInMap(target) || !hasPower || _me.HasUnitFlag(UnitFlags.Silenced))
allowMove = true; allowMove = true;