diff --git a/src/common/Common.h b/src/common/Common.h index fdb52426..29296509 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -785,10 +785,10 @@ namespace Sapphire::Common ExteriorWall, ExteriorWindow, ExteriorDoor, - OtherFloorWall, - OtherFloorFlooring, - BasementWall, - YardSign + ExteriorRoofDecoration, + ExteriorWallDecoration, + ExteriorPlacard, + ExteriorFence }; enum HousingInteriorSlot diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp index c6485ef6..206c06a9 100644 --- a/src/lobby/GameConnection.cpp +++ b/src/lobby/GameConnection.cpp @@ -188,7 +188,7 @@ void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet if( i == 3 ) { charListPacket->data().entitledExpansion = 2; - charListPacket->data().maxCharOnWorld = 8; + charListPacket->data().maxCharOnWorld = 25; charListPacket->data().unknown8 = 8; charListPacket->data().veteranRank = 12; charListPacket->data().counter = ( i * 4 ) + 1; diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp index a11ebc04..6f410bc6 100644 --- a/src/world/Manager/HousingMgr.cpp +++ b/src/world/Manager/HousingMgr.cpp @@ -604,7 +604,7 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play // create and link items for( auto& destContainer : invMap ) { - auto container = houseInventory[ destContainer.first ]; + auto& container = houseInventory[ destContainer.first ]; for( auto& item : destContainer.second ) { @@ -904,7 +904,7 @@ void Sapphire::World::Manager::HousingMgr::updateHouseModels( Sapphire::HousePtr } else { - framework()->get< Logger >()->error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for outdoor appearance." ); + Logger::error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for outdoor appearance." ); } auto intContainer = containers.find( static_cast< uint16_t >( InventoryType::HousingInteriorAppearance ) ); @@ -918,7 +918,7 @@ void Sapphire::World::Manager::HousingMgr::updateHouseModels( Sapphire::HousePtr } else { - framework()->get< Logger >()->error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for indoor appearance." ); + Logger::error( "Plot " + std::to_string( house->getLandIdent().landId ) + " has an invalid inventory configuration for indoor appearance." ); } } diff --git a/src/world/Manager/InventoryMgr.cpp b/src/world/Manager/InventoryMgr.cpp index 02c68cc8..07fb0267 100644 --- a/src/world/Manager/InventoryMgr.cpp +++ b/src/world/Manager/InventoryMgr.cpp @@ -134,7 +134,7 @@ void Sapphire::World::Manager::InventoryMgr::saveHousingContainerItem( uint64_t // the second time is for the ON DUPLICATE KEY UPDATE condition stmt->setUInt64( 5, itemId ); - pDb->execute( stmt ); + pDb->directExecute( stmt ); } void Sapphire::World::Manager::InventoryMgr::updateHousingItemPosition( Sapphire::Inventory::HousingItemPtr item )