mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 23:27:45 +00:00
Code Activity

Linkshell join logic redone to use linkshell result packets.

Browse source
This commit is contained in:
Mordred 2021-12-07 00:02:41 +01:00
parent 147ebedfde
commit 139f771e7a
4 changed files with 87 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,8 @@
#include <Network/GameConnection.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/PacketWrappers/LinkshellResultPacket.h>
#include <Network/PacketDef/ClientIpcs.h>
#include "Session.h"
@ -218,11 +220,7 @@ void Sapphire::World::Manager::LinkshellMgr::finishLinkshellCreation( const std:
{
auto& server = Common::Service< World::WorldServer >::ref();
auto linkshellResult = makeZonePacket< FFXIVIpcLinkshellResult >( player.getId() );
linkshellResult->data().Result = result;
linkshellResult->data().UpPacketNo = 1;
linkshellResult->data().Identity = 0xFF;
strcpy( linkshellResult->data().LinkshellName, name.c_str() );
auto linkshellResult = makeLinkshellResult( player, 0, 0, 1, 0, 0, name, "" );
server.queueForPlayer( player.getCharacterId(), linkshellResult );
}
@ -249,19 +247,32 @@ const std::vector< Sapphire::LinkshellPtr > Sapphire::World::Manager::LinkshellM
return lsVec;
}
void LinkshellMgr::invitePlayer( const std::string &name, uint64_t linkshellId )
void LinkshellMgr::invitePlayer( Entity::Player& sourcePlayer, Entity::Player& invitedPlayer, uint64_t linkshellId )
{
auto& server = Common::Service< World::WorldServer >::ref();
auto invitedPlayer = server.getSession( name );
auto lsPtr = getLinkshellById( linkshellId );
if( !invitedPlayer || !lsPtr )
return Logger::warn( "Failed to invite player to linkshell - session/linkshell not found!" );
if( !lsPtr )
return Logger::warn( "Failed to invite player to linkshell - linkshell not found!" );
lsPtr->addInvite( invitedPlayer->getPlayer()->getCharacterId() );
lsPtr->addInvite( invitedPlayer.getCharacterId() );
writeLinkshell( lsPtr->getId() );
sendLinkshellList( *invitedPlayer->getPlayer() );
sendLinkshellList( invitedPlayer );
auto linkshellInviteResult = makeLinkshellResult( invitedPlayer, 0, 0,
WorldPackets::Client::LinkshellJoin, 0,
LinkshellResultPacket::UpdateStatus::Target,
lsPtr->getName(), sourcePlayer.getName() );
server.queueForPlayer( invitedPlayer.getCharacterId(), linkshellInviteResult );
auto linkshellInviteResult1 = makeLinkshellResult( sourcePlayer, 0, 0,
WorldPackets::Client::LinkshellJoin, 0,
LinkshellResultPacket::UpdateStatus::Execute,
lsPtr->getName(), invitedPlayer.getName() );
server.queueForPlayer( sourcePlayer.getCharacterId(), linkshellInviteResult1 );
}
void LinkshellMgr::sendLinkshellList( Entity::Player& player )

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

@ -38,7 +38,7 @@ namespace Sapphire::World::Manager
void finishLinkshellCreation( const std::string& name, uint32_t result, Entity::Player& player );
void invitePlayer( const std::string& name, uint64_t linkshellId );
void invitePlayer( Entity::Player& sourcePlayer, Entity::Player& invitedPlayer, uint64_t linkshellId );
void sendLinkshellList( Entity::Player& player );

13
src/world/Network/Handlers/LinkshellHandlers.cpp
View file

@ -12,6 +12,7 @@
#include "Session.h"
#include "Actor/Player.h"
#include "Manager/LinkshellMgr.h"
#include <WorldServer.h>
using namespace Sapphire::Common;
using namespace Sapphire::Network::Packets;
@ -27,9 +28,19 @@ void Sapphire::Network::GameConnection::linkshellListHandler( const Packets::FFX
void Sapphire::Network::GameConnection::linkshellJoinHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
{
const auto lsJoinPacket = ZoneChannelPacket< Client::FFXIVIpcLinkshellJoin >( inPacket );
auto& server = Common::Service< World::WorldServer >::ref();
auto& lsMgr = Common::Service< LinkshellMgr >::ref();
auto charName = std::string( lsJoinPacket.data().MemberCharacterName );
lsMgr.invitePlayer( charName, lsJoinPacket.data().LinkshellID );
auto invitedPlayer = server.getSession( charName );
if( !invitedPlayer )
{
Logger::error( std::string( __FUNCTION__ ) + " requested player \"{}\" not found!", charName );
return;
}
lsMgr.invitePlayer( player, *invitedPlayer->getPlayer(), lsJoinPacket.data().LinkshellID );
}

52
src/world/Network/PacketWrappers/LinkshellResultPacket.h Normal file
View file

@ -0,0 +1,52 @@
#pragma once
#include <Network/GamePacket.h>
#include "Forwards.h"
#include <Util/Util.h>
#include <Util/UtilMath.h>
#include <Common.h>
namespace Sapphire::Network::Packets::WorldPackets::Server
{
class LinkshellResultPacket : public ZoneChannelPacket< FFXIVIpcLinkshellResult >
{
public:
enum UpdateStatus : uint8_t
{
None = 0,
Execute = 10,
Target = 11,
Member = 12,
};
LinkshellResultPacket( Entity::Player& player, uint64_t linkshellId, uint64_t targetId,
uint16_t upPacketNo, uint32_t result, uint8_t updateStatus, const std::string& lsName, const std::string& targetName ) :
ZoneChannelPacket< FFXIVIpcLinkshellResult >( player.getId(), player.getId() )
{
initialize( player, linkshellId, targetId, upPacketNo, result, updateStatus, lsName, targetName );
};
private:
void initialize( Entity::Player& player, uint64_t linkshellId, uint64_t targetId,
uint16_t upPacketNo, uint32_t result, uint8_t updateStatus, const std::string& lsName, const std::string& targetName )
{
m_data.LinkshellID = linkshellId;
m_data.Identity = 0xFF;
m_data.UpPacketNo = static_cast< uint32_t >( upPacketNo );
m_data.Result = result;
m_data.UpdateStatus = updateStatus;
m_data.TargetCharacterID = targetId;
strcpy( m_data.LinkshellName, lsName.c_str() );
strcpy( m_data.TargetName, targetName.c_str() );
};
};
template< typename... Args >
std::shared_ptr< LinkshellResultPacket > makeLinkshellResult( Args... args )
{
return std::make_shared< LinkshellResultPacket >( args... );
}
}