mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-06 02:37:47 +00:00
Code Activity

failing nullptr check should abort the function.

Browse source
This commit is contained in:
Mordred 2023-02-09 12:55:45 +01:00
parent 07f0bd31bd
commit 9d647e2bde
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,7 +179,10 @@ void FreeCompanyMgr::sendFcInviteList( Entity::Player& player )
// fill master character data // fill master character data
auto masterCharacter = server.getPlayer( fc->getMasterId() ); auto masterCharacter = server.getPlayer( fc->getMasterId() );
if( !masterCharacter ) if( !masterCharacter )
{
Logger::error( "FreeCompanyMgr: Unable to look up master character#{}!", fc->getMasterId() ); Logger::error( "FreeCompanyMgr: Unable to look up master character#{}!", fc->getMasterId() );
return;
}
inviteListPacket->data().MasterCharacter.GrandCompanyID = masterCharacter->getGc(); inviteListPacket->data().MasterCharacter.GrandCompanyID = masterCharacter->getGc();
inviteListPacket->data().MasterCharacter.CharacterID = masterCharacter->getCharacterId(); inviteListPacket->data().MasterCharacter.CharacterID = masterCharacter->getCharacterId();