diff --git a/src/common/Common.h b/src/common/Common.h index 9f1d8001..29e2aa34 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -676,6 +676,8 @@ namespace Core { SetCharaGearParamUI = 0x260, GearSetEquipMsg = 0x321, + + DisableCurrentFestival = 0x386, ToggleOrchestrionUnlock = 0x396, Dismount = 0x3a0 diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index c505904a..f1893eea 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -1,7 +1,7 @@ #ifndef _CORE_NETWORK_PACKETS_IPCS_H #define _CORE_NETWORK_PACKETS_IPCS_H -#include +#include namespace Core { namespace Network { @@ -72,8 +72,11 @@ namespace Packets { Playtime = 0x00DF, // updated 4.2 CFRegistered = 0x00B8, // updated 4.1 - SocialRequestResponse = 0x00BB, // updated 4.1 + + Chat = 0x00E1, // updated 4.2 + SocialRequestResponse = 0x00E5, // updated 4.1 + SocialRequestReceive = 0x00E6, // updated 4.2 SocialList = 0x00E7, // updated 4.2 UpdateSearchInfo = 0x00EA, // updated 4.2 diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp index cfa11ab0..3842db70 100644 --- a/src/servers/sapphire_zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -29,6 +29,7 @@ #include "Script/ScriptManager.h" +#include "Social/Manager/SocialMgr.h> #include "Social/FriendList.h" #include "Script/ScriptManager.h" diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index 3582a67f..1131eef1 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -453,7 +453,7 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket listPacket.data().entries[0].contentId = player.getContentId(); listPacket.data().entries[0].level = player.getLevel(); listPacket.data().entries[0].zoneId = player.getCurrentZone()->getTerritoryId(); - listPacket.data().entries[0].zoneId1 = 0x0100; + // listPacket.data().entries[0].zoneId1 = 0x0100; // TODO: no idea what this does //listPacket.data().entries[0].one = 1; diff --git a/src/servers/sapphire_zone/Social/Group.cpp b/src/servers/sapphire_zone/Social/Group.cpp index c026dda1..835b7061 100644 --- a/src/servers/sapphire_zone/Social/Group.cpp +++ b/src/servers/sapphire_zone/Social/Group.cpp @@ -141,7 +141,7 @@ Core::Network::Packets::Server::PlayerEntry Group::generatePlayerEntry( GroupMem entry.classJob = pPlayer->getClass(); entry.level = pPlayer->getLevel(); - entry.zoneId = pPlayer->getCurrentZone()->getId(); + entry.zoneId = pPlayer->getCurrentZone()->getGuId(); entry.grandCompany = pPlayer->getGc(); memcpy( &entry.fcTag[0], "Meme", 4 ); entry.clientLanguage = 2;