Have equipment tied into player inventory instead of keeping its own list of pointers to items. This ensures the ressource is up-to-date and avoids crashes on stale item pointers.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 85790b42..eddc0ea0 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -87,7 +87,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                         position++;
                     }
                     item = inventory->getItem(index);
-                    player_node->mEquipment->setEquipment(position, item);
+                    player_node->mEquipment->setEquipment(position, index);
                 }
             }
             break;
@@ -117,13 +117,13 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 position++;
             }
             logger->log("Position %i", position);
-            item = player_node->mEquipment->getEquipment(position);
+            item =  player_node->getInventory()->getItem(player_node->mEquipment->getEquipment(position));
             if (item) {
                 item->setEquipped(false);
             }
 
             item = inventory->getItem(index);
-            player_node->mEquipment->setEquipment(position, item);
+            player_node->mEquipment->setEquipment(position, index);
             break;
 
         case SMSG_PLAYER_UNEQUIP:
@@ -192,7 +192,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
 
             item->setEquipped(true);
-            player_node->mEquipment->setArrows(item);
+            player_node->mEquipment->setArrows(index);
             logger->log("Arrows equipped: %i", index);
             break;
     }