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

Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2

Browse source
This commit is contained in:
collett 2020-02-24 20:03:29 +09:00
commit 514a27b41f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/PacketDef/Zone/ClientZoneDef.h
View file

@ -217,7 +217,7 @@ struct FFXIVIpcInventoryModifyHandler :
{
/* 0000 */ uint32_t seq;
/* 0004 */ Common::InventoryOperation action;
/* 0005 */ uint8_t pad_0005[6];
/* 0006 */ uint8_t pad_0006[6];
/* 000C */ uint16_t fromContainer;
/* 000E */ uint8_t pad_000E[2];
/* 0010 */ uint8_t fromSlot;

2
src/world/Actor/PlayerInventory.cpp
View file

@ -570,7 +570,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
for( uint8_t slot = 0; slot < storage->getMaxSize(); slot++ )
{
if ( !canMerge && foundFreeSlot )
if( !canMerge && foundFreeSlot )
break;
auto item = storage->getItem( slot );