From ded211a6b5bb428c853c05b8dfa832253b35485e Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 8 Feb 2023 15:43:11 +0100
Subject: [PATCH] getPlayerFreeCompany now returning the real result

---
 src/world/Manager/FreeCompanyMgr.cpp | 14 ++++++--------
 src/world/Manager/FreeCompanyMgr.h   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/world/Manager/FreeCompanyMgr.cpp b/src/world/Manager/FreeCompanyMgr.cpp
index 5e3a39e9..563cc35d 100644
--- a/src/world/Manager/FreeCompanyMgr.cpp
+++ b/src/world/Manager/FreeCompanyMgr.cpp
@@ -267,16 +267,14 @@ void FreeCompanyMgr::sendFreeCompanyStatus( Entity::Player& player )
 
 }
 
-FreeCompanyPtr FreeCompanyMgr::getPlayerFreeCompany( Entity::Player& player ) const
+FreeCompanyPtr FreeCompanyMgr::getPlayerFreeCompany( Entity::Player& player )
 {
-  for( const auto &[ key, value ] : m_fcIdMap )
-  {
-    if( value->getMasterId() == player.getCharacterId() )
-    {
-      return value;
-    }
-  }
+  auto it = m_charaIdToFcIdMap.find( player.getCharacterId() );
+  if( it != m_charaIdToFcIdMap.end() )
+    return getFreeCompanyById( it->second );
+
   return nullptr;
+
 }
 
 void FreeCompanyMgr::sendFcInviteList( Entity::Player& player )
diff --git a/src/world/Manager/FreeCompanyMgr.h b/src/world/Manager/FreeCompanyMgr.h
index 4ae902ee..520fffac 100644
--- a/src/world/Manager/FreeCompanyMgr.h
+++ b/src/world/Manager/FreeCompanyMgr.h
@@ -49,7 +49,7 @@ namespace Sapphire::World::Manager
     void sendFreeCompanyStatus( Entity::Player& player );
 
     // get fc associated with player
-    FreeCompanyPtr getPlayerFreeCompany( Entity::Player& player ) const;
+    FreeCompanyPtr getPlayerFreeCompany( Entity::Player& player );
     FreeCompanyPtr getFreeCompanyById( uint64_t fcId );
     FreeCompanyPtr getFreeCompanyByName( const std::string& name );