From a35455a4f4c1aca9170e75105016b9c5cd3ebf51 Mon Sep 17 00:00:00 2001 From: Lucy <44952533+Skyliegirl33@users.noreply.github.com> Date: Mon, 23 Jan 2023 05:34:38 +0100 Subject: [PATCH] Remove status updates in unnecessary places (cherry picked from commit 12f68b62690861675daa2436630f33518c39b7f7) --- src/world/Actor/Player.cpp | 2 -- src/world/Manager/WarpMgr.cpp | 1 - src/world/Network/Handlers/PacketCommandHandler.cpp | 1 - 3 files changed, 4 deletions(-) diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 6f71c033..fc9b52d6 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -1507,7 +1507,6 @@ void Player::sendZonePackets() initPacket->data().playerActorId = getId(); queuePacket( initPacket ); - sendStatusUpdate(); sendInventory(); if( isLogin() ) @@ -1524,7 +1523,6 @@ 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/Manager/WarpMgr.cpp b/src/world/Manager/WarpMgr.cpp index 7dcd1f8b..b5b23f97 100644 --- a/src/world/Manager/WarpMgr.cpp +++ b/src/world/Manager/WarpMgr.cpp @@ -85,7 +85,6 @@ void WarpMgr::finishWarp( Entity::Player& player ) player.sendToInRangeSet( zoneInPacket ); player.sendToInRangeSet( SetStatusPacket, true ); - player.sendStatusUpdate(); auto& server = Common::Service< WorldServer >::ref(); server.queueForPlayer( player.getCharacterId(), zoneInPacket ); diff --git a/src/world/Network/Handlers/PacketCommandHandler.cpp b/src/world/Network/Handlers/PacketCommandHandler.cpp index e34f70ff..632b0db4 100644 --- a/src/world/Network/Handlers/PacketCommandHandler.cpp +++ b/src/world/Network/Handlers/PacketCommandHandler.cpp @@ -594,7 +594,6 @@ 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;