From fa5a972b38fa0f03149b93ace348fa20de433e4d Mon Sep 17 00:00:00 2001 From: collett Date: Fri, 30 Jul 2021 03:51:54 +0900 Subject: [PATCH] minor update --- src/world/Manager/HousingMgr.cpp | 6 +++--- src/world/Manager/HousingMgr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp index 48af60cd..1a755f57 100644 --- a/src/world/Manager/HousingMgr.cpp +++ b/src/world/Manager/HousingMgr.cpp @@ -1634,7 +1634,7 @@ Sapphire::Inventory::HousingItemPtr Sapphire::World::Manager::HousingMgr::getHou return Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId() ); } -void Sapphire::World::Manager::HousingMgr::editAppearance( bool isInterior, Sapphire::Entity::Player& player, const Common::LandIdent& landIdent, std::vector< uint16_t > containerList, std::vector< uint8_t> slotList, uint8_t removeFlag ) +void Sapphire::World::Manager::HousingMgr::editAppearance( bool isInterior, Sapphire::Entity::Player& player, const Common::LandIdent landIdent, std::vector< uint16_t > containerList, std::vector< uint8_t> slotList, uint8_t removeFlag ) { auto landSetId = toLandSetId( static_cast< uint16_t >( landIdent.territoryTypeId ), static_cast< uint8_t >( landIdent.wardNum ) ); auto terri = getHousingZoneByLandSetId( landSetId ); @@ -1665,7 +1665,7 @@ void Sapphire::World::Manager::HousingMgr::editAppearance( bool isInterior, Sapp if( oldItem ) { housingContainer->removeItem( i ); - invMgr.removeItemFromHousingContainer( land->getLandIdent(), housingContainer->getId(), i ); + invMgr.removeItemFromHousingContainer( landIdent, housingContainer->getId(), i ); player.addItem( oldItem, false, false, false ); } } @@ -1684,7 +1684,7 @@ void Sapphire::World::Manager::HousingMgr::editAppearance( bool isInterior, Sapp } } invMgr.sendInventoryContainer( player, housingContainer ); - invMgr.saveHousingContainer( land->getLandIdent(), housingContainer ); + invMgr.saveHousingContainer( landIdent, housingContainer ); updateHouseModels( land->getHouse() ); if( !isInterior ) { diff --git a/src/world/Manager/HousingMgr.h b/src/world/Manager/HousingMgr.h index 99143325..1984a16c 100644 --- a/src/world/Manager/HousingMgr.h +++ b/src/world/Manager/HousingMgr.h @@ -181,7 +181,7 @@ namespace Sapphire::World::Manager bool hasPermission( Entity::Player& player, Land& land, uint32_t permission ); - void editAppearance( bool isInterior, Sapphire::Entity::Player& player, const Common::LandIdent& landIdent, std::vector< uint16_t > containerList, std::vector< uint8_t > slotList, uint8_t removeFlag ); + void editAppearance( bool isInterior, Sapphire::Entity::Player& player, const Common::LandIdent landIdent, std::vector< uint16_t > containerList, std::vector< uint8_t > slotList, uint8_t removeFlag ); private: