From b199036f5ae21b4e1ad59e5f110455c0175ae11b Mon Sep 17 00:00:00 2001 From: NotAdam Date: Thu, 26 Jul 2018 23:29:58 +1000 Subject: [PATCH] improve behaviour for creating items with correct max stack sizes --- src/servers/sapphire_zone/Actor/PlayerSql.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp index 98d897de..04a3d900 100644 --- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp @@ -566,10 +566,7 @@ Core::ItemPtr Core::Entity::Player::createItem( uint32_t catalogId, uint16_t qua if( !itemInfo ) return nullptr; - uint16_t itemAmount = quantity; - - if( itemInfo->stackSize == 1 ) - itemAmount = 1; + auto itemAmount = std::min< uint16_t >( quantity, static_cast< uint16_t >( itemInfo->stackSize ) ); if( !itemInfo ) return nullptr;