From 9598212aad5969ac047883291c88429d5a76f6b6 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sat, 11 Aug 2018 16:05:37 +0300
Subject: [PATCH] [Client] Don't add bound items to inventory as a result of
 item packets

Additionally, don't include bound items when sending PlayerInventory packets.
---
 apps/openmw/mwmp/LocalPlayer.cpp | 34 ++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index aa562a442..1b3c12d24 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -677,6 +677,10 @@ void LocalPlayer::addItems()
 
     for (const auto &item : inventoryChanges.items)
     {
+        // Skip bound items
+        if (MWBase::Environment::get().getMechanicsManager()->isBoundItem(item.refId))
+            continue;
+
         try
         {
             MWWorld::Ptr itemPtr = *ptrStore.add(item.refId, item.count, ptrPlayer);
@@ -1116,17 +1120,21 @@ void LocalPlayer::setEquipment()
                 return Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), currentItem.refId);
             });
 
-            if (it == ptrInventory.end()) // If the item is not in our inventory, add it
+            // If the item is not in our inventory, add it as long as it's not a bound item
+            if (it == ptrInventory.end())
             {
-                try
-                {
-                    auto addIter = ptrInventory.ContainerStore::add(currentItem.refId.c_str(), currentItem.count, ptrPlayer);
-
-                    ptrInventory.equip(slot, addIter, ptrPlayer);
-                }
-                catch (std::exception&)
+                if (!MWBase::Environment::get().getMechanicsManager()->isBoundItem(currentItem.refId))
                 {
-                    LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid equipment item %s", currentItem.refId.c_str());
+                    try
+                    {
+                        auto addIter = ptrInventory.ContainerStore::add(currentItem.refId.c_str(), currentItem.count, ptrPlayer);
+
+                        ptrInventory.equip(slot, addIter, ptrPlayer);
+                    }
+                    catch (std::exception&)
+                    {
+                        LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid equipment item %s", currentItem.refId.c_str());
+                    }
                 }
             }
             else
@@ -1368,7 +1376,13 @@ void LocalPlayer::sendInventory()
     for (const auto &iter : ptrInventory)
     {
         item.refId = iter.getCellRef().getRefId();
-        if (item.refId.find("$dynamic") != string::npos) // skip generated items (self enchanted for e.g.)
+
+        // Skip any items that somehow have clientside-only dynamic IDs
+        if (item.refId.find("$dynamic") != string::npos)
+            continue;
+
+        // Skip bound items
+        if (MWBase::Environment::get().getMechanicsManager()->isBoundItem(item.refId))
             continue;
 
         item.count = iter.getRefData().getCount();