From 21b6bd176f2c40f1e953fd599030d5f64e8abae5 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 1 Oct 2017 17:11:30 +0400
Subject: [PATCH] AI: Autoequip armor when bound armor spell expires

---
 apps/openmw/mwmechanics/actors.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index cef429504..69ccdf9e4 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -71,7 +71,9 @@ void adjustBoundItem (const std::string& item, bool bound, const MWWorld::Ptr& a
     }
     else
     {
-        actor.getClass().getContainerStore(actor).remove(item, 1, actor);
+        MWWorld::Ptr itemPtr = actor.getClass().getInventoryStore(actor).search(item);
+        if (!itemPtr.isEmpty())
+            actor.getClass().getInventoryStore(actor).remove(itemPtr, 1, actor, true);
     }
 }