diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index b6a6180c..da45d3a3 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1039,7 +1039,9 @@ namespace Sapphire::Network::Packets::Server char padding1[8]; uint64_t mainWeaponModel; uint64_t secWeaponModel; - char unknown2[16]; + uint8_t unknown2; + uint16_t worldId; + char unknown3[12]; struct ItemData { uint32_t catalogId; diff --git a/src/world/Network/PacketWrappers/ExaminePacket.h b/src/world/Network/PacketWrappers/ExaminePacket.h index cd6bbb7b..37baee37 100644 --- a/src/world/Network/PacketWrappers/ExaminePacket.h +++ b/src/world/Network/PacketWrappers/ExaminePacket.h @@ -49,6 +49,8 @@ namespace Sapphire::Network::Packets::Server m_data.mainWeaponModel = pTarget->getModelMainWeapon(); m_data.secWeaponModel = pTarget->getModelSubWeapon(); + m_data.worldId = 67; // TODO: world id from server + memcpy( m_data.look, pTarget->getLookArray(), sizeof( m_data.look ) ); m_data.models[ Common::GearModelSlot::ModelHead ] = pTarget->getModelForSlot( Common::GearModelSlot::ModelHead ); diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h index 3ca8304e..14e16754 100644 --- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h @@ -31,6 +31,10 @@ namespace Sapphire::Network::Packets::Server m_data.classJob = static_cast< uint8_t >( player.getClass() ); //m_data.status = static_cast< uint8_t >( pPlayer->getStatus() ); +// TODO: world id from server + m_data.currentWorldId = 67; + m_data.homeWorldId = 67; + m_data.hPCurr = player.getHp(); m_data.mPCurr = player.getMp(); m_data.tPCurr = player.getTp();