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] 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 <Service.h>
 #include <Manager/TerritoryMgr.h>
+#include <Manager/PlayerMgr.h>
 
 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;