refactor: drop Controlled || Summoned checks that guard GetMaster()

GetMaster() is already null unless the creature is controlled or
summoned, so golem damage transfer, pack instinct, house access and
indirect spell targeting test its result instead.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Author: kamronbatman

Projects/UOContent/Items/Weapons/BaseWeapon.cs

@@ -1698,7 +1698,7 @@ public virtual int GetPackInstinctBonus(Mobile attacker, Mobile defender)
             return 0;
         }
 
-        if (attacker is not BaseCreature bc || bc.PackInstinct == PackInstinct.None || !bc.Controlled && !bc.Summoned)
+        if (attacker is not BaseCreature bc || bc.PackInstinct == PackInstinct.None)
         {
             return 0;
         }
@@ -1713,8 +1713,7 @@ public virtual int GetPackInstinctBonus(Mobile attacker, Mobile defender)
         var inPack = 1;
         foreach (var m in defender.GetMobilesInRange<BaseCreature>(1))
         {
-            if (m != attacker && (m.PackInstinct & bc.PackInstinct) != 0 && (m.Controlled || m.Summoned) &&
-                master == m.GetMaster() && m.Combatant == defender)
+            if (m != attacker && (m.PackInstinct & bc.PackInstinct) != 0 && master == m.GetMaster() && m.Combatant == defender)
             {
                 inPack++;
             }

Projects/UOContent/Mobiles/Monsters/Misc/Melee/Golem.cs

@@ -142,22 +142,17 @@ public override void OnDeath(Container c)
 
         public override void OnDamage(int amount, Mobile from, bool willKill)
         {
-            if (Controlled || Summoned)
+            if (GetMaster() is { Player: true } master && master.Map == Map && master.InRange(Location, 20))
             {
-                var master = GetMaster();
-
-                if (master?.Player == true && master.Map == Map && master.InRange(Location, 20))
+                if (master.Mana >= amount)
                 {
-                    if (master.Mana >= amount)
-                    {
-                        master.Mana -= amount;
-                    }
-                    else
-                    {
-                        amount -= master.Mana;
-                        master.Mana = 0;
-                        master.Damage(amount);
-                    }
+                    master.Mana -= amount;
+                }
+                else
+                {
+                    amount -= master.Mana;
+                    master.Mana = 0;
+                    master.Damage(amount);
                 }
             }
 

Projects/UOContent/Multis/Houses/BaseHouse.cs

@@ -3660,11 +3660,6 @@ public bool HasAccess(Mobile m)
                 return true;
             }
 
-            if (!(bc.Controlled || bc.Summoned))
-            {
-                return false;
-            }
-
             m = bc.GetMaster();
 
             return m != null && (m.AccessLevel > AccessLevel.Player || IsFriend(m) || Access?.Contains(m) == true);

Projects/UOContent/Spells/Base/SpellHelper.cs

@@ -449,29 +449,17 @@ public static bool ValidIndirectTarget(Mobile from, Mobile to)
                 return false;
             }
 
-            if (bcTarg != null && (bcTarg.Controlled || bcTarg.Summoned))
+            if (bcTarg?.GetMaster() is { } targMaster)
             {
-                if (bcTarg.GetMaster() == from)
-                {
-                    return false;
-                }
-
-                if (p != null && p.Contains(bcTarg.GetMaster()))
+                if (targMaster == from || p?.Contains(targMaster) == true)
                 {
                     return false;
                 }
             }
 
-            if (bcFrom != null && (bcFrom.Controlled || bcFrom.Summoned))
+            if (bcFrom?.GetMaster() is { } fromMaster)
             {
-                if (bcFrom.GetMaster() == to)
-                {
-                    return false;
-                }
-
-                p = Party.Get(to);
-
-                if (p != null && p.Contains(bcFrom.GetMaster()))
+                if (fromMaster == to || Party.Get(to)?.Contains(fromMaster) == true)
                 {
                     return false;
                 }