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

Fixed some small linkshell issues

Browse source
This commit is contained in:
Mordred 2021-12-22 23:17:35 +01:00
parent 34139a8937
commit b7aaeb38b1
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/world/Manager/LinkshellMgr.cpp
View file

@ -233,6 +233,7 @@ const std::vector< Sapphire::LinkshellPtr > Sapphire::World::Manager::LinkshellM
for( const auto &[ key, value ] : m_linkshellIdMap ) for( const auto &[ key, value ] : m_linkshellIdMap )
{ {
auto& memberList = value->getMemberIdList(); auto& memberList = value->getMemberIdList();
auto& inviteList = value->getInviteIdList(); auto& inviteList = value->getInviteIdList();
@ -258,16 +259,16 @@ void LinkshellMgr::invitePlayer( Entity::Player& sourcePlayer, Entity::Player& i
lsPtr->addInvite( invitedPlayer.getCharacterId() ); lsPtr->addInvite( invitedPlayer.getCharacterId() );
writeLinkshell( lsPtr->getId() ); writeLinkshell( lsPtr->getId() );
sendLinkshellList( invitedPlayer ); //sendLinkshellList( invitedPlayer );
auto linkshellInviteResult = makeLinkshellResult( invitedPlayer, 0, 0, auto linkshellInviteResult = makeLinkshellResult( invitedPlayer, lsPtr->getId(), 0,
WorldPackets::Client::LinkshellJoin, 0, WorldPackets::Client::LinkshellJoin, 0,
LinkshellResultPacket::UpdateStatus::Target, LinkshellResultPacket::UpdateStatus::Target,
lsPtr->getName(), sourcePlayer.getName() ); lsPtr->getName(), sourcePlayer.getName() );
server.queueForPlayer( invitedPlayer.getCharacterId(), linkshellInviteResult ); server.queueForPlayer( invitedPlayer.getCharacterId(), linkshellInviteResult );
auto linkshellInviteResult1 = makeLinkshellResult( sourcePlayer, 0, 0, auto linkshellInviteResult1 = makeLinkshellResult( sourcePlayer, lsPtr->getId(), 0,
WorldPackets::Client::LinkshellJoin, 0, WorldPackets::Client::LinkshellJoin, 0,
LinkshellResultPacket::UpdateStatus::Execute, LinkshellResultPacket::UpdateStatus::Execute,
lsPtr->getName(), invitedPlayer.getName() ); lsPtr->getName(), invitedPlayer.getName() );
@ -291,14 +292,14 @@ void LinkshellMgr::kickPlayer( Entity::Player& sourcePlayer, Entity::Player& kic
writeLinkshell( lsPtr->getId() ); writeLinkshell( lsPtr->getId() );
sendLinkshellList( kickedPlayer ); sendLinkshellList( kickedPlayer );
auto linkshellKickResult = makeLinkshellResult( kickedPlayer, 0, 0, auto linkshellKickResult = makeLinkshellResult( kickedPlayer, lsPtr->getId(), 0,
WorldPackets::Client::LinkshellKick, 0, WorldPackets::Client::LinkshellKick, 0,
LinkshellResultPacket::UpdateStatus::Target, LinkshellResultPacket::UpdateStatus::Target,
lsPtr->getName(), sourcePlayer.getName() ); lsPtr->getName(), sourcePlayer.getName() );
server.queueForPlayer( kickedPlayer.getCharacterId(), linkshellKickResult ); server.queueForPlayer( kickedPlayer.getCharacterId(), linkshellKickResult );
auto linkshellKickResult1 = makeLinkshellResult( sourcePlayer, 0, 0, auto linkshellKickResult1 = makeLinkshellResult( sourcePlayer, lsPtr->getId(), 0,
WorldPackets::Client::LinkshellKick, 0, WorldPackets::Client::LinkshellKick, 0,
LinkshellResultPacket::UpdateStatus::Execute, LinkshellResultPacket::UpdateStatus::Execute,
lsPtr->getName(), kickedPlayer.getName() ); lsPtr->getName(), kickedPlayer.getName() );

5
src/world/Network/GameConnection.cpp
View file

@ -181,7 +181,10 @@ void Sapphire::Network::GameConnection::onAccept( const std::string& host, uint1
void Sapphire::Network::GameConnection::onDisconnect() void Sapphire::Network::GameConnection::onDisconnect()
{ {
Logger::debug( "[{0}] Disconnect", m_pSession->getId() ); if( m_pSession )
Logger::debug( "[{0}] Disconnect", m_pSession->getId() );
else
Logger::debug( "Disconnect of lost session." );
m_pSession.reset(); m_pSession.reset();
} }