diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 18943f97..0743420b 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -114,8 +114,7 @@ namespace Packets { ObjectDespawn = 0x017E, // updated 4.3 SetLevelSync = 0x017F, // updated 4.3 - - InventoryActionAck = 0x0180, // updated 4.2 ? + SilentSetClassJob = 0x0180, // updated 4.3 - seems to be the case, not sure if it's actually used for anything InitUI = 0x0181, // updated 4.3 PlayerStats = 0x0182, // updated 4.3 @@ -130,7 +129,8 @@ namespace Packets { ContainerInfo = 0x0192, // updated 4.3 InventoryTransactionFinish = 0x0193, // updated 4.3 InventoryTransaction = 0x0194, // updated 4.3 - CurrencyCrystalInfo = 0x0197, // updated 4.3 + InventoryActionAck = 0x0197, // updated 4.3 + CurrencyCrystalInfo = 0xFFFF, // updated 4.3 - wrong opcode UpdateInventorySlot = 0x0198, // updated 4.3 diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp index a4d5e015..e1d2078b 100644 --- a/src/servers/sapphire_zone/Inventory/Inventory.cpp +++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp @@ -945,24 +945,19 @@ uint16_t Core::Inventory::calculateEquippedGearItemLevel() auto it = gearSetMap.begin(); - while ( it != gearSetMap.end() ) + while( it != gearSetMap.end() ) { auto currItem = it->second; - if ( currItem ) + if( currItem ) { iLvlResult += currItem->getItemLevel(); // If item is weapon and isn't one-handed - if ( currItem->isWeapon() && !isOneHandedWeapon( currItem->getCategory() ) ) + if( currItem->isWeapon() && !isOneHandedWeapon( currItem->getCategory() ) ) { iLvlResult += currItem->getItemLevel(); } - else - { - auto pLog = g_fw.get< Logger >(); - pLog->debug( "Is one handed" ); - } } it++; diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp index e77210bc..a264f77a 100644 --- a/src/servers/sapphire_zone/Inventory/Item.cpp +++ b/src/servers/sapphire_zone/Inventory/Item.cpp @@ -21,7 +21,7 @@ Core::Item::Item( uint32_t catalogId ) : Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, Common::ItemUICategory categoryId, bool isHq ) : m_id( catalogId ), m_uId( uId ), - m_category( static_cast< Common::ItemUICategory >( categoryId ) ), + m_category( categoryId ), m_model1( model1 ), m_model2( model2 ), m_isHq( isHq )