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

Scripts/Guards: Fix infinite loop in npc_air_force_bots

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/98863659bb308f87f2b344e0c7f3b72985d8c5c4)
This commit is contained in:
hondacrx
2021-12-01 23:03:19 -05:00
parent 0f030d61cf
commit 694bda573b
1 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/World/NpcSpecial.cs
+52 -38
View File
@@ -463,6 +463,10 @@ namespace Scripts.World.NpcSpecial
[Script] [Script]
class npc_air_force_bots : ScriptedAI class npc_air_force_bots : ScriptedAI
{ {
SpawnAssociation SpawnAssoc;
ObjectGuid SpawnedGUID;
List<ObjectGuid> inLineOfSightSinceLastUpdate = new();
public npc_air_force_bots(Creature creature) : base(creature) public npc_air_force_bots(Creature creature) : base(creature)
{ {
SpawnAssoc = null; SpawnAssoc = null;
@@ -492,9 +496,6 @@ namespace Scripts.World.NpcSpecial
} }
} }
SpawnAssociation SpawnAssoc;
ObjectGuid SpawnedGUID;
public override void Reset() { } public override void Reset() { }
Creature SummonGuard() Creature SummonGuard()
@@ -521,6 +522,13 @@ namespace Scripts.World.NpcSpecial
return null; return null;
} }
public void UpdateAI(uint diff)
{
base.UpdateAI(diff);
inLineOfSightSinceLastUpdate.Clear();
}
public override void MoveInLineOfSight(Unit who) public override void MoveInLineOfSight(Unit who)
{ {
if (SpawnAssoc == null) if (SpawnAssoc == null)
@@ -543,55 +551,61 @@ namespace Scripts.World.NpcSpecial
switch (SpawnAssoc.spawnType) switch (SpawnAssoc.spawnType)
{ {
case SpawnType.AlarmBot: case SpawnType.AlarmBot:
{
// handle only 1 change for world update for each target
if (inLineOfSightSinceLastUpdate.Contains(who.GetGUID()))
return;
inLineOfSightSinceLastUpdate.Add(who.GetGUID());
if (!who.IsWithinDistInMap(me, Misc.RangeGuardsMark))
return;
Aura markAura = who.GetAura(SpellIds.GuardsMark);
if (markAura != null)
{ {
if (!who.IsWithinDistInMap(me, Misc.RangeGuardsMark)) // the target wasn't able to move out of our range within 25 seconds
return; if (!lastSpawnedGuard)
Aura markAura = who.GetAura(SpellIds.GuardsMark);
if (markAura != null)
{ {
// the target wasn't able to move out of our range within 25 seconds lastSpawnedGuard = SummonGuard();
if (!lastSpawnedGuard)
{
lastSpawnedGuard = SummonGuard();
if (!lastSpawnedGuard)
return;
}
if (markAura.GetDuration() < Misc.AuraDurationTimeLeft)
if (!lastSpawnedGuard.GetVictim())
lastSpawnedGuard.GetAI().AttackStart(who);
}
else
{
if (!lastSpawnedGuard)
lastSpawnedGuard = SummonGuard();
if (!lastSpawnedGuard) if (!lastSpawnedGuard)
return; return;
lastSpawnedGuard.CastSpell(who, SpellIds.GuardsMark, true);
} }
break;
}
case SpawnType.TripwireRooftop:
{
if (!who.IsWithinDistInMap(me, Misc.RangeTripwire))
return;
if (markAura.GetDuration() < Misc.AuraDurationTimeLeft)
if (!lastSpawnedGuard.GetVictim())
lastSpawnedGuard.GetAI().AttackStart(who);
}
else
{
if (!lastSpawnedGuard) if (!lastSpawnedGuard)
lastSpawnedGuard = SummonGuard(); lastSpawnedGuard = SummonGuard();
if (!lastSpawnedGuard) if (!lastSpawnedGuard)
return; return;
// ROOFTOP only triggers if the player is on the ground lastSpawnedGuard.CastSpell(who, SpellIds.GuardsMark, true);
if (!playerTarget.IsFlying() && !lastSpawnedGuard.GetVictim())
lastSpawnedGuard.GetAI().AttackStart(who);
break;
} }
break;
}
case SpawnType.TripwireRooftop:
{
if (!who.IsWithinDistInMap(me, Misc.RangeTripwire))
return;
if (!lastSpawnedGuard)
lastSpawnedGuard = SummonGuard();
if (!lastSpawnedGuard)
return;
// ROOFTOP only triggers if the player is on the ground
if (!playerTarget.IsFlying() && !lastSpawnedGuard.GetVictim())
lastSpawnedGuard.GetAI().AttackStart(who);
break;
}
} }
} }
} }