From 4bad733366bc675c774c5ce3c9fa1cfda757f172 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Wed, 28 Jul 2021 21:01:46 -0700
Subject: [PATCH] fix: Fixes TeleportPets (#666)

---
 Projects/UOContent/Mobiles/BaseCreature.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Projects/UOContent/Mobiles/BaseCreature.cs b/Projects/UOContent/Mobiles/BaseCreature.cs
index 8275289bb..0de22b4b1 100644
--- a/Projects/UOContent/Mobiles/BaseCreature.cs
+++ b/Projects/UOContent/Mobiles/BaseCreature.cs
@@ -3803,15 +3803,16 @@ namespace Server.Mobiles
 
             foreach (var m in master.GetMobilesInRange(3))
             {
-                if (m is BaseCreature pet)
+                if (
+                    m is BaseCreature {
+                        Controlled: true,
+                        ControlOrder: OrderType.Guard or OrderType.Follow or OrderType.Come
+                    } pet
+                )
                 {
-                    if (pet.Controlled && pet.ControlMaster == master && !onlyBonded || pet.IsBonded)
+                    if (pet.ControlMaster == master && (!onlyBonded || pet.IsBonded))
                     {
-                        if (pet.ControlOrder == OrderType.Guard || pet.ControlOrder == OrderType.Follow ||
-                            pet.ControlOrder == OrderType.Come)
-                        {
-                            move.Add(pet);
-                        }
+                        move.Add(pet);
                     }
                 }
             }