mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 08:27:46 +00:00
Code Activity

getPlayerFreeCompany now returning the real result

Browse source
This commit is contained in:
Mordred 2023-02-08 15:43:11 +01:00
parent 38b92fafa9
commit ded211a6b5
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/world/Manager/FreeCompanyMgr.cpp
View file

@ -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 ) auto it = m_charaIdToFcIdMap.find( player.getCharacterId() );
{ if( it != m_charaIdToFcIdMap.end() )
if( value->getMasterId() == player.getCharacterId() ) return getFreeCompanyById( it->second );
{
return value;
}
}
return nullptr; return nullptr;
} }
void FreeCompanyMgr::sendFcInviteList( Entity::Player& player ) void FreeCompanyMgr::sendFcInviteList( Entity::Player& player )

2
src/world/Manager/FreeCompanyMgr.h
View file

@ -49,7 +49,7 @@ namespace Sapphire::World::Manager
void sendFreeCompanyStatus( Entity::Player& player ); void sendFreeCompanyStatus( Entity::Player& player );
// get fc associated with player // get fc associated with player
FreeCompanyPtr getPlayerFreeCompany( Entity::Player& player ) const; FreeCompanyPtr getPlayerFreeCompany( Entity::Player& player );
FreeCompanyPtr getFreeCompanyById( uint64_t fcId ); FreeCompanyPtr getFreeCompanyById( uint64_t fcId );
FreeCompanyPtr getFreeCompanyByName( const std::string& name ); FreeCompanyPtr getFreeCompanyByName( const std::string& name );