mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 22:37:45 +00:00
Code Activity

Merge remote-tracking branch 'origin/develop' into packet_work

Browse source
This commit is contained in:
Mordred 2018-06-18 23:04:00 +02:00
commit 685763ae73
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/Network/PacketDef/Ipcs.h
View file

@ -114,8 +114,7 @@ namespace Packets {
ObjectDespawn = 0x017E, // updated 4.3 ObjectDespawn = 0x017E, // updated 4.3
SetLevelSync = 0x017F, // updated 4.3 SetLevelSync = 0x017F, // updated 4.3
SilentSetClassJob = 0x0180, // updated 4.3 - seems to be the case, not sure if it's actually used for anything
InventoryActionAck = 0x0180, // updated 4.2 ?
InitUI = 0x0181, // updated 4.3 InitUI = 0x0181, // updated 4.3
PlayerStats = 0x0182, // updated 4.3 PlayerStats = 0x0182, // updated 4.3
@ -130,7 +129,8 @@ namespace Packets {
ContainerInfo = 0x0192, // updated 4.3 ContainerInfo = 0x0192, // updated 4.3
InventoryTransactionFinish = 0x0193, // updated 4.3 InventoryTransactionFinish = 0x0193, // updated 4.3
InventoryTransaction = 0x0194, // 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 UpdateInventorySlot = 0x0198, // updated 4.3

11
src/servers/sapphire_zone/Inventory/Inventory.cpp
View file

@ -945,24 +945,19 @@ uint16_t Core::Inventory::calculateEquippedGearItemLevel()
auto it = gearSetMap.begin(); auto it = gearSetMap.begin();
while ( it != gearSetMap.end() ) while( it != gearSetMap.end() )
{ {
auto currItem = it->second; auto currItem = it->second;
if ( currItem ) if( currItem )
{ {
iLvlResult += currItem->getItemLevel(); iLvlResult += currItem->getItemLevel();
// If item is weapon and isn't one-handed // If item is weapon and isn't one-handed
if ( currItem->isWeapon() && !isOneHandedWeapon( currItem->getCategory() ) ) if( currItem->isWeapon() && !isOneHandedWeapon( currItem->getCategory() ) )
{ {
iLvlResult += currItem->getItemLevel(); iLvlResult += currItem->getItemLevel();
} }
else
{
auto pLog = g_fw.get< Logger >();
pLog->debug( "Is one handed" );
}
} }
it++; it++;

2
src/servers/sapphire_zone/Inventory/Item.cpp
View file

@ -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 ) : Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, Common::ItemUICategory categoryId, bool isHq ) :
m_id( catalogId ), m_id( catalogId ),
m_uId( uId ), m_uId( uId ),
m_category( static_cast< Common::ItemUICategory >( categoryId ) ), m_category( categoryId ),
m_model1( model1 ), m_model1( model1 ),
m_model2( model2 ), m_model2( model2 ),
m_isHq( isHq ) m_isHq( isHq )