From f265073720419a7575adcd7a13bb0ea61aaed773 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 1 Dec 2021 23:08:19 -0500
Subject: [PATCH] Misc Fixes

---
 Source/Game/Entities/Unit/Unit.Combat.cs                  | 7 ++++++-
 Source/Game/Movement/Generators/ChaseMovementGenerator.cs | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs
index 528d373e9..4136f66b5 100644
--- a/Source/Game/Entities/Unit/Unit.Combat.cs
+++ b/Source/Game/Entities/Unit/Unit.Combat.cs
@@ -856,7 +856,12 @@ namespace Game.Entities
             {
                 Pet pet = player.GetPet();
                 if (pet != null && pet.IsAlive() && pet.IsControlled())
-                    pet.GetAI().KilledUnit(victim);
+                {
+                    if (pet.IsAIEnabled())
+                        pet.GetAI().KilledUnit(victim);
+                    else
+                        Log.outError(LogFilter.Unit, "Pet doesn't have any AI in Unit.Kill()");
+                }
             }
 
             // 10% durability loss on death
diff --git a/Source/Game/Movement/Generators/ChaseMovementGenerator.cs b/Source/Game/Movement/Generators/ChaseMovementGenerator.cs
index 7250e5d40..7a7b47168 100644
--- a/Source/Game/Movement/Generators/ChaseMovementGenerator.cs
+++ b/Source/Game/Movement/Generators/ChaseMovementGenerator.cs
@@ -169,7 +169,7 @@ namespace Game.Movement
                         owner.UpdateAllowedPositionZ(x, y, ref z);
 
                     bool success = _path.CalculatePath(x, y, z, owner.CanFly());
-                    if (!success || _path.GetPathType().HasAnyFlag(PathType.NoPath | PathType.Incomplete))
+                    if (!success || _path.GetPathType().HasAnyFlag(PathType.NoPath))
                     {
                         if (cOwner)
                             cOwner.SetCannotReachTarget(true);