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

Merge branch 'main' into addon-tutorial

Browse source
This commit is contained in:
Leath Cooper 2025-01-01 17:17:41 -05:00
commit 2d5a7fd879
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1358,7 +1358,19 @@ namespace Server.Mobiles
return true; return true;
} }
return m_Team != c.m_Team || (_summoned || m_Controlled) != (c._summoned || c.m_Controlled); if (m_Team != c.Team)
{
return true;
}
var targetControlled = c._summoned || c.m_Controlled;
if (_summoned || m_Controlled)
{
return targetControlled || c.IsEnemy(GetMaster());
}
return targetControlled && IsEnemy(c.GetMaster());
} }
public override string ApplyNameSuffix(string suffix) public override string ApplyNameSuffix(string suffix)