diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index 9bad8d4e..efed3b31 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -218,7 +218,18 @@ namespace Sapphire::Network::ActorControl SetFavorite = 0x1FC, LearnTeleport = 0x1FD, - OpenRecommendationGuide = 0x200, + /*! + * param1 = event type bitmask + * 1 = Quest + * 2 = GuildLeveAssignment + * 4 = GuildOrderGuide + * 8 = TripleTriad + * 16 = CustomTalk + * 32 = PreHandler + */ + BeginMapUpdate = 0x1FF, + FinishMapUpdate = 0x200, + ArmoryErrorMsg = 0x201, AchievementPopup = 0x203, 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() ) 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; 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;