From 2474a3d285d4cc4547b818e41855f395ae2b39ae Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Sun, 20 Feb 2022 19:12:28 +0100 Subject: [PATCH 1/3] Fix TP showing as 0 (cherry picked from commit 8aed3c6a958424f4ffdce033b46ef62473b5925b) --- src/world/Actor/Player.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index f6d1af23..7b201689 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -1508,6 +1508,7 @@ void Player::sendZonePackets() sendHuntingLog(); sendStats(); + sendStatusUpdate(); // only initialize the UI if the player in fact just logged in. if( isLogin() ) From 85578a52031c77d3c0beb0efc063850ce13e33cc Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Sun, 20 Feb 2022 19:12:57 +0100 Subject: [PATCH 2/3] Fix itemlvl field (cherry picked from commit 969c44864c6df1648da995b6a36a759338ac3689) --- src/world/Inventory/Item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/Inventory/Item.cpp b/src/world/Inventory/Item.cpp index 03286805..483b510e 100644 --- a/src/world/Inventory/Item.cpp +++ b/src/world/Inventory/Item.cpp @@ -26,7 +26,7 @@ Sapphire::Item::Item( uint64_t uId, uint32_t catalogId, bool isHq ) : m_autoAttackDmg = static_cast< float >( m_weaponDmg * m_delayMs ) / 3000; m_category = static_cast< Common::ItemUICategory >( itemInfo->data().UICategory ); m_slot = itemInfo->data().Slot; - m_itemLevel = itemInfo->data().EquipLevel; + m_itemLevel = itemInfo->data().Level; m_maxStackSize = itemInfo->data().StackMax; // EXD TODO: Not sure what this maps to //m_additionalData = itemInfo->additionalData; From e8fdc72b6e809dd5a5423bd3f01b2d762b6f9992 Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Sun, 20 Feb 2022 19:13:33 +0100 Subject: [PATCH 3/3] Fix EquipDisplayFlags resetting on zonein (cherry picked from commit 9d29bab9a2a6417f764c2b9e2f9d0c834f7c4e92) --- src/world/Manager/PlayerMgr.cpp | 1 - src/world/Network/Handlers/PacketCommandHandler.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp index 67b59495..1db8129b 100644 --- a/src/world/Manager/PlayerMgr.cpp +++ b/src/world/Manager/PlayerMgr.cpp @@ -62,7 +62,6 @@ void PlayerMgr::onOnlineStatusChanged( Entity::Player& player, bool updateProfil void PlayerMgr::onEquipDisplayFlagsChanged( Entity::Player& player ) { auto& server = Common::Service< World::WorldServer >::ref(); - PlayerMgr::sendDebug( player, "EquipDisplayFlag CHANGE: {0}", player.getEquipDisplayFlags() ); auto paramPacket = makeZonePacket< FFXIVIpcConfig >( player.getId() ); paramPacket->data().flag = player.getEquipDisplayFlags(); player.sendToInRangeSet( paramPacket, true ); diff --git a/src/world/Network/Handlers/PacketCommandHandler.cpp b/src/world/Network/Handlers/PacketCommandHandler.cpp index 627e1a09..37a8f7e9 100644 --- a/src/world/Network/Handlers/PacketCommandHandler.cpp +++ b/src/world/Network/Handlers/PacketCommandHandler.cpp @@ -25,6 +25,7 @@ #include "Forwards.h" #include #include +#include using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; @@ -595,6 +596,7 @@ void Sapphire::Network::GameConnection::commandHandler( const Packets::FFXIVARR_ auto& warpMgr = Service< WarpMgr >::ref(); warpMgr.finishWarp( player ); player.setLoadingComplete( true ); + Service< World::Manager::PlayerMgr >::ref().onEquipDisplayFlagsChanged( player ); if( player.isLogin() ) player.setIsLogin( false ); break;