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

fix: Prevents recursion in BaseCreature.DoHarmful() (#2202)

Browse source
This commit is contained in:
Bohica 2025-07-22 16:01:56 -07:00 • committed by GitHub
parent 8a118170e7
commit 173037ae77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Mobiles/Mobile.cs
View file

@ -8286,7 +8286,7 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
Region.OnDidHarmful(this, target);
target.Region.OnGotHarmful(this, target);
if (!indirect)
if (!indirect && !ChangingCombatant)
{
Combatant = target;
}

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

@ -2626,13 +2626,10 @@ namespace Server.Mobiles
if (ai.Defender == target)
{
if (m_ControlMaster?.Player == true && m_ControlMaster.CanBeHarmful(target, false))
var master = GetMaster();
if (master?.Player == true && master.CanBeHarmful(target, false))
{
m_ControlMaster.DoHarmful(target, true);
}
else if (m_SummonMaster?.Player == true && m_SummonMaster.CanBeHarmful(target, false))
{
m_SummonMaster.DoHarmful(target, true);
master.DoHarmful(target, true);
}
return;