From 53349a57716f61cf5fc76eb62b057da2c3286880 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sun, 26 Sep 2021 14:30:08 -0400
Subject: [PATCH] Misc fixes

---
 Source/Game/AI/SmartScripts/SmartScript.cs | 2 +-
 Source/Game/Handlers/CharacterHandler.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs
index bfc4a6632..5b7b58b7e 100644
--- a/Source/Game/AI/SmartScripts/SmartScript.cs
+++ b/Source/Game/AI/SmartScripts/SmartScript.cs
@@ -4127,7 +4127,7 @@ namespace Game.AI
                 return false;
 
             bool smart = true;
-            if (gameObject.GetAI<SmartAI>() == null)
+            if (gameObject.GetAI<SmartGameObjectAI>() == null)
                 smart = false;
 
             if (!smart && !silent)
diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs
index bc5c4f4ff..efad0dfb2 100644
--- a/Source/Game/Handlers/CharacterHandler.cs
+++ b/Source/Game/Handlers/CharacterHandler.cs
@@ -1644,7 +1644,7 @@ namespace Game
                 if (item.GetPos() == dstPos)
                     continue;
 
-                if (_player.CanEquipItem(ItemConst.NullSlot, out dstPos, item, false) != InventoryResult.Ok)
+                if (_player.CanEquipItem(i, out dstPos, item, true) != InventoryResult.Ok)
                     continue;
 
                 GetPlayer().SwapItem(item.GetPos(), dstPos);