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

Compile please thanks

Browse source
This commit is contained in:
Maru 2017-12-08 21:04:58 -02:00
parent fa3bc04f8e
commit 794fef41a3
3 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/servers/Server_Zone/Actor/Player.h
View file

@ -3,17 +3,16 @@
#include "Forwards.h"
<<<<<<< HEAD
#include <src/servers/Server_Common/Common.h>
#include <src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <src/servers/Server_Zone/Actor/Social/FriendList.h>
#include <src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.h>
=======
#include <Server_Common/Common.h>
#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <Server_Zone/Actor/Social/FriendList.h>
#include <Server_Zone/Actor/Social/Manager/FriendListMgr.h>
#include <Server_Common/Common.h>
>>>>>>> d84d3be97820f596f748daefbdf8b472df002c61
#include "Actor.h"
#include "Inventory/Inventory.h"
#include <map>
#include <queue>

6
src/servers/Server_Zone/Actor/Social/Group.cpp
View file

@ -87,9 +87,9 @@ Core::Network::Packets::Server::PlayerEntry Group::generatePlayerEntry( GroupMem
// todo: set as offline in one of the unknown values, if session does not exist
auto pSession = g_serverZone.getSession( groupMember.contentId ); // todo: aa i don't like this. maybe just store their ID instead of contentID???
entry.bytes[3] = 0x80;
entry.bytes[4] = 0x02;
entry.bytes[6] = 0x3B;
entry.bytes[3] = 0x10;
entry.bytes[4] = 0x00;
entry.bytes[6] = 0x3F;
entry.bytes[11] = 0x10;
if( pSession )
{

34
src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
View file

@ -447,11 +447,11 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket
listPacket.data().entries[0].bytes[4] = 0x02;
listPacket.data().entries[0].bytes[6] = 0x3B;
listPacket.data().entries[0].bytes[11] = 0x10;
listPacket.data().entries[0].classJob = static_cast< uint8_t >( player.getClass() );
listPacket.data().entries[0].classJob = player.getClass();
listPacket.data().entries[0].contentId = player.getContentId();
listPacket.data().entries[0].level = player.getLevel();
listPacket.data().entries[0].zoneId = player.getCurrentZone()->getId();
listPacket.data().entries[0].zoneId1 = 0x0100;
//listPacket.data().entries[0].zoneId1 = 0x0100;
// TODO: no idea what this does
//listPacket.data().entries[0].one = 1;
@ -476,9 +476,9 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket
uint16_t i = 0;
g_log.debug( std::to_string( pPlayer->getFriendsList()->getMembers().size() ) );
g_log.debug( std::to_string( player.getFriendsList()->getMembers().size() ) );
for ( auto member : pPlayer->getFriendsList()->getMembers() )
for ( auto member : player.getFriendsList()->getMembers() )
{
if ( i == 10 )
break;
@ -499,20 +499,20 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket
}
void Core::Network::GameConnection::socialReqResponseHandler( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer )
Entity::Player& player )
{
auto targetId = inPacket.getValAt< uint32_t >( 0x20 );
auto category = inPacket.getValAt< Common::SocialCategory >( 0x28 );
auto action = inPacket.getValAt< Common::SocialRequestAction >( 0x29 );
ZoneChannelPacket< FFXIVIpcSocialRequestError > info( targetId, pPlayer->getId() );
ZoneChannelPacket< FFXIVIpcSocialRequestResponse > response( targetId, pPlayer->getId() );
ZoneChannelPacket< FFXIVIpcSocialRequestError > info( targetId, player.getId() );
ZoneChannelPacket< FFXIVIpcSocialRequestResponse > response( targetId, player.getId() );
info.data().category = category;
response.data().category = category;
//auto pQR = g_database.query( "SELECT Name FROM dbchara WHERE CharacterId = " + to_string( targetId ) );
auto name = pPlayer->getName();
auto name = player.getName();
/*
if( pQR->getRowCount() > 0 )
{
@ -546,11 +546,11 @@ void Core::Network::GameConnection::socialReqResponseHandler( const Packets::Gam
}
response.data().response = Common::SocialRequestResponse::Accept;
memcpy( &( response.data().name ), name.c_str(), 32 );
pPlayer->queuePacket( response );
player.queuePacket( response );
}
void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer )
Entity::Player& player )
{
// todo: handle all social request packets here
auto category = inPacket.getValAt< Common::SocialCategory >( 0x20 );
@ -559,7 +559,7 @@ void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePac
auto pSession = g_serverZone.getSession( name );
// only the requester needs the response
ZoneChannelPacket< FFXIVIpcSocialRequestError > response( pPlayer->getId() );
ZoneChannelPacket< FFXIVIpcSocialRequestError > response( player.getId() );
memcpy( &( response.data().name ), name.c_str(), 32 );
// todo: enumerate log messages
@ -588,7 +588,7 @@ void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePac
return;
}*/
if( pRecipient->getId() == pPlayer->getId() )
if( pRecipient->getId() == player.getId() )
{
response.data().messageId = 321; // Unable to invite.
}
@ -658,7 +658,7 @@ void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePac
if( successful )
{
ZoneChannelPacket< FFXIVIpcSocialRequestReceive > packet( pPlayer->getId(), pRecipient->getId() );
ZoneChannelPacket< FFXIVIpcSocialRequestReceive > packet( player.getId(), pRecipient->getId() );
std::array<uint16_t, 5> typeMessage{ 0,
1, // You invite <name> to a party.
@ -675,24 +675,24 @@ void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePac
pRecipient->setTempVariable( typeVar[category] + "Id", pPlayer->getId() );
pRecipient->setTempVariable( typeVar[category] + "Timer", expireTime );*/
packet.data().actorId = pPlayer->getId();
packet.data().actorId = player.getId();
packet.data().category = category;
packet.data().action = Core::Common::SocialRequestAction::Invite;
packet.data().unknown3 = 80;
packet.data().unknown = 46;
packet.data().unknown2 = 64;
memcpy( &( packet.data().name ), pPlayer->getName().c_str(), 32 );
memcpy( &( packet.data().name ), player.getName().c_str(), 32 );
pRecipient->queuePacket( packet );
pRecipient->sendDebug( "ding ding" );
pRecipient->getFriendsList()->addMember( pPlayer, pRecipient, pPlayer->getId(), pRecipient->getId() );
pRecipient->getFriendsList()->addMember( player.getAsPlayer(), pRecipient, player.getId(), pRecipient->getId() );
response.data().messageId = typeMessage[category];
}
}
pPlayer->queuePacket( response );
player.queuePacket( response );
// todo: handle party, friend request
g_log.debug("sent to " + name);
}