From 867dd6eb78b4a52fa8caecd215e58b1c51515375 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 31 Dec 2024 13:38:58 -0800 Subject: [PATCH] fix: Fixes NPC summon IsEnemy check against other mobs (#2041) --- Projects/UOContent/Mobiles/BaseCreature.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Projects/UOContent/Mobiles/BaseCreature.cs b/Projects/UOContent/Mobiles/BaseCreature.cs index b6558209a..5ba9d01c6 100644 --- a/Projects/UOContent/Mobiles/BaseCreature.cs +++ b/Projects/UOContent/Mobiles/BaseCreature.cs @@ -1358,7 +1358,19 @@ namespace Server.Mobiles 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)