[Client] Use ADD before REMOVE for PlayerInventory in repair/recharge

Previously, when recharging or repairing an item, the client sent a PlayerInventory packet to the server with the old version of the item that was supposed to be removed and then it sent a PlayerInventory packet with the new version of the item that was supposed to be added.

Unfortunately, the current CoreScripts make it so custom items using generated IDs have their records deleted when they are completely removed from the world, however briefly, even if they are added back immediately afterwards. In practice, this meant that – before this commit – recharging or repairing a custom item led to its removal from the player inventory stored on the server, followed by the deletion of its record, followed by its readdition to the inventory (but with the record staying deleted). Logging out and logging back in immediately prevented the player from receiving the item anymore because of its now non-existent record.

apps/openmw/mwgui/recharge.cpp

@@ -17,6 +17,7 @@
 #include "../mwmp/Main.hpp"
 #include "../mwmp/Networking.hpp"
 #include "../mwmp/LocalPlayer.hpp"
+#include "../mwmp/MechanicsHelper.hpp"
 /*
     End of tes3mp addition
 */
@@ -182,12 +183,15 @@ void Recharge::onItemClicked(MyGUI::Widget *sender, const MWWorld::Ptr& item)
             Send PlayerInventory packets that replace the original item with the new one
         */
         mwmp::LocalPlayer *localPlayer = mwmp::Main::get().getLocalPlayer();
-        localPlayer->sendItemChange(item, 1, mwmp::InventoryChanges::REMOVE);
+        mwmp::Item removedItem = MechanicsHelper::getItem(item, 1);
 
         item.getCellRef().setEnchantmentCharge(
             std::min(item.getCellRef().getEnchantmentCharge() + restored, static_cast<float>(enchantment->mData.mCharge)));
 
-        localPlayer->sendItemChange(item, 1, mwmp::InventoryChanges::ADD);
+        mwmp::Item addedItem = MechanicsHelper::getItem(item, 1);
+
+        localPlayer->sendItemChange(addedItem, mwmp::InventoryChanges::ADD);
+        localPlayer->sendItemChange(removedItem, mwmp::InventoryChanges::REMOVE);
         /*
             End of tes3mp change (minor)
         */

apps/openmw/mwmechanics/repair.cpp

@@ -12,6 +12,7 @@
 #include "../mwmp/Main.hpp"
 #include "../mwmp/Networking.hpp"
 #include "../mwmp/LocalPlayer.hpp"
+#include "../mwmp/MechanicsHelper.hpp"
 /*
     End of tes3mp addition
 */
@@ -76,11 +77,14 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
             Send PlayerInventory packets that replace the original item with the new one
         */
         mwmp::LocalPlayer *localPlayer = mwmp::Main::get().getLocalPlayer();
-        localPlayer->sendItemChange(itemToRepair, 1, mwmp::InventoryChanges::REMOVE);
+        mwmp::Item removedItem = MechanicsHelper::getItem(itemToRepair, 1);
 
         itemToRepair.getCellRef().setCharge(charge);
 
-        localPlayer->sendItemChange(itemToRepair, 1, mwmp::InventoryChanges::ADD);
+        mwmp::Item addedItem = MechanicsHelper::getItem(itemToRepair, 1);
+
+        localPlayer->sendItemChange(addedItem, mwmp::InventoryChanges::ADD);
+        localPlayer->sendItemChange(removedItem, mwmp::InventoryChanges::REMOVE);
         /*
             End of tes3mp change (minor)
         */