warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Adds guard for monster ability recursion (#2363)

Browse source
This commit is contained in:
Kamron Batman 2026-03-12 19:26:49 -07:00 • committed by GitHub
parent 6b6cc10771
commit 55fe688eaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -1130,6 +1130,8 @@ namespace Server.Mobiles
public virtual MonsterAbility[] GetMonsterAbilities() => null;
private MonsterAbilityTrigger _activeTriggers;
public virtual MonsterAbility GetAbility(MonsterAbilityType type)
{
var abilities = GetMonsterAbilities();
@ -1186,6 +1188,11 @@ namespace Server.Mobiles
public virtual bool TriggerAbility(MonsterAbilityTrigger trigger, Mobile defender)
{
if ((_activeTriggers & trigger) != 0)
{
return false;
}
var abilities = GetMonsterAbilities();
if (abilities == null)
@ -1193,18 +1200,26 @@ namespace Server.Mobiles
return false;
}
var triggered = false;
for (var i = 0; i < abilities.Length; i++)
_activeTriggers |= trigger;
try
{
var ability = abilities[i];
if (ability.CanTrigger(this, trigger))
var triggered = false;
for (var i = 0; i < abilities.Length; i++)
{
ability.Trigger(trigger, this, defender);
triggered = true;
var ability = abilities[i];
if (ability.CanTrigger(this, trigger))
{
ability.Trigger(trigger, this, defender);
triggered = true;
}
}
}
return triggered;
return triggered;
}
finally
{
_activeTriggers &= ~trigger;
}
}
public virtual void TriggerAbilityMove(MonsterAbilityTrigger trigger, Mobile defender, Direction d)