mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 17:27:47 +00:00
Code Activity

fix storing items in the housing storerooms for real this time

Browse source
This commit is contained in:
NotAdam 2018-12-31 22:45:39 +11:00
parent 1c890a43bf
commit d421888a07
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/world/Manager/HousingMgr.cpp
View file

@ -568,7 +568,7 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
if( !player.findFirstItemWithId( presetCatalogId, foundItem ) ) if( !player.findFirstItemWithId( presetCatalogId, foundItem ) )
return false; return false;
auto item = player.dropInventoryItem( foundItem.first, foundItem.second ); auto item = getHousingItemFromPlayer( player, foundItem.first, foundItem.second );
if( !item ) if( !item )
return false; return false;
@ -1002,12 +1002,10 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
containerId == InventoryType::Bag2 || containerId == InventoryType::Bag2 ||
containerId == InventoryType::Bag3 ) containerId == InventoryType::Bag3 )
{ {
auto tmpItem = player.dropInventoryItem( static_cast< Common::InventoryType >( containerId ), slotId ); item = getHousingItemFromPlayer( player, static_cast< Common::InventoryType >( containerId ), slotId );
if( !tmpItem ) if( !item )
return; return;
item = Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId(), framework() );
// set params // set params
item->setPos( { item->setPos( {
Util::floatToUInt16( pos.x ), Util::floatToUInt16( pos.x ),
@ -1074,7 +1072,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
if( freeSlot == -1 ) if( freeSlot == -1 )
return; return;
auto item = player.dropInventoryItem( static_cast< Common::InventoryType >( containerId ), slotId ); auto item = getHousingItemFromPlayer( player, static_cast< Common::InventoryType >( containerId ), slotId );
if( !item ) if( !item )
return; return;
@ -1097,7 +1095,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
continue; continue;
} }
auto item = player.dropInventoryItem( static_cast< Common::InventoryType >( containerId ), slotId ); auto item = getHousingItemFromPlayer( player, static_cast< Common::InventoryType >( containerId ), slotId );
if( !item ) if( !item )
return; return;
@ -1386,7 +1384,7 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
{ {
auto& containers = getEstateInventory( terri.getLandIdent() ); auto& containers = getEstateInventory( terri.getLandIdent() );
uint8_t containerIdx = 0; int8_t containerIdx = 0;
if( isPlacedItemsInventory( static_cast< Common::InventoryType >( containerId ) ) ) if( isPlacedItemsInventory( static_cast< Common::InventoryType >( containerId ) ) )
{ {
@ -1617,4 +1615,14 @@ bool Sapphire::World::Manager::HousingMgr::hasPermission( Sapphire::Entity::Play
// todo: check perms here // todo: check perms here
return false; return false;
}
Sapphire::Inventory::HousingItemPtr Sapphire::World::Manager::HousingMgr::getHousingItemFromPlayer(
Entity::Player& player, Common::InventoryType type, uint8_t slot )
{
auto tmpItem = player.dropInventoryItem( type, slot );
if( !tmpItem )
return nullptr;
return Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId(), framework() );
} }

2
src/world/Manager/HousingMgr.h
View file

@ -185,6 +185,8 @@ namespace Sapphire::World::Manager
private: private:
Inventory::HousingItemPtr getHousingItemFromPlayer( Entity::Player& player, Common::InventoryType type, uint8_t slot );
ItemContainerPtr getFreeEstateInventorySlot( Common::LandIdent ident, ItemContainerPtr getFreeEstateInventorySlot( Common::LandIdent ident,
Inventory::InventoryContainerPair& pair, Inventory::InventoryContainerPair& pair,
Inventory::InventoryTypeList bagList ); Inventory::InventoryTypeList bagList );