From 34e9ba131ee1ed196bacd98ca2f281b6fd3b385d Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Dec 2018 20:10:07 +1100
Subject: [PATCH] fix items not being able to be removed from external
 storeroom

---
 src/world/Manager/HousingMgr.cpp              | 28 ++++++++++++-------
 src/world/Manager/HousingMgr.h                |  3 +-
 .../Network/Handlers/ClientTriggerHandler.cpp |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index c51e7640..b267ad3a 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -1307,7 +1307,9 @@ void Sapphire::World::Manager::HousingMgr::reqRemoveHousingItem( Sapphire::Entit
     if( land->getOwnerId() != player.getId() )
       return;
 
-    removeExternalItem( player, *terri, *land, slot, sendToStoreroom );
+    auto containerType = static_cast< Common::InventoryType >( containerId );
+
+    removeExternalItem( player, *terri, *land, containerType, slot, sendToStoreroom );
   }
 }
 
@@ -1319,6 +1321,7 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
   auto& containers = getEstateInventory( terri.getLandIdent() );
 
   // validate the container id first
+  // we also need the idx of the container so we can get the slot offset
   bool foundContainer = false;
   uint8_t containerIdx = 0;
   for( auto cId : m_internalPlacedItemContainers )
@@ -1395,13 +1398,18 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
 }
 
 bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& player, HousingZone& terri, Land& land,
-                                                               uint16_t slotId, bool sendToStoreroom )
+                                                               Common::InventoryType containerType, uint16_t slotId,
+                                                               bool sendToStoreroom )
 {
   auto& containers = getEstateInventory( land.getLandIdent() );
 
-  auto& placedContainer = containers[ InventoryType::HousingExteriorPlacedItems ];
+  auto needle = containers.find( containerType );
+  if( needle == containers.end() )
+    return false;
 
-  auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( placedContainer->getItem( slotId ) );
+  auto& sourceContainer = needle->second;
+
+  auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( sourceContainer->getItem( slotId ) );
   if( !item )
     return false;
 
@@ -1415,10 +1423,10 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
     if( freeSlot == -1 )
       return false;
 
-    placedContainer->removeItem( slotId );
-    invMgr->sendInventoryContainer( player, placedContainer );
+    sourceContainer->removeItem( slotId );
+    invMgr->sendInventoryContainer( player, sourceContainer );
     invMgr->removeHousingItemPosition( *item );
-    invMgr->removeItemFromHousingContainer( land.getLandIdent(), placedContainer->getId(), slotId );
+    invMgr->removeItemFromHousingContainer( land.getLandIdent(), sourceContainer->getId(), slotId );
 
     storeroomContainer->setItem( freeSlot, item );
     invMgr->sendInventoryContainer( player, storeroomContainer );
@@ -1431,10 +1439,10 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
       return false;
 
     // remove from housing inv
-    placedContainer->removeItem( slotId );
-    invMgr->sendInventoryContainer( player, placedContainer );
+    sourceContainer->removeItem( slotId );
+    invMgr->sendInventoryContainer( player, sourceContainer );
     invMgr->removeHousingItemPosition( *item );
-    invMgr->removeItemFromHousingContainer( land.getLandIdent(), placedContainer->getId(), slotId );
+    invMgr->removeItemFromHousingContainer( land.getLandIdent(), sourceContainer->getId(), slotId );
 
     // add to player inv
     player.insertInventoryItem( containerPair.first, containerPair.second, item );
diff --git a/src/world/Manager/HousingMgr.h b/src/world/Manager/HousingMgr.h
index 512a7a05..273ec484 100644
--- a/src/world/Manager/HousingMgr.h
+++ b/src/world/Manager/HousingMgr.h
@@ -203,7 +203,8 @@ namespace Sapphire::World::Manager
      * @return
      */
     bool removeExternalItem( Entity::Player& player, HousingZone& terri, Land& land,
-                             uint16_t slotId, bool sendToStoreroom );
+                             Common::InventoryType containerType, uint16_t slotId,
+                             bool sendToStoreroom );
 
     /*!
      * @brief Processes the movement of an item placed in a HousingZone
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 28249ee8..44b309e4 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -464,7 +464,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
       auto slot = param4 & 0xFF;
       auto sendToStoreroom = ( param4 >> 16 ) != 0;
 
-      //player,  plot, containerId, slot, sendToStoreroom
+      //player, plot, containerId, slot, sendToStoreroom
       housingMgr->reqRemoveHousingItem( player, param12, param2, slot, sendToStoreroom );
 
       break;