From b85bc25f5889b2530dffe6d6c5f695e9fbc6d42f Mon Sep 17 00:00:00 2001 From: Maru Date: Thu, 7 Dec 2017 17:28:55 -0200 Subject: [PATCH] Refactor some more, work on Manager global obj; --- .../Actor/Group/Manager/FriendListMgr.cpp | 2 - .../Actor/Group/Manager/FriendListMgr.h | 41 ------------------- src/servers/Server_Zone/Actor/Player.cpp | 9 +++- src/servers/Server_Zone/Actor/Player.h | 7 ++-- .../Actor/{Group => Social}/ContentGroup.cpp | 0 .../Actor/{Group => Social}/ContentGroup.h | 0 .../Actor/{Group => Social}/FreeCompany.cpp | 0 .../Actor/{Group => Social}/FreeCompany.h | 0 .../Actor/{Group => Social}/FriendList.cpp | 3 +- .../Actor/{Group => Social}/FriendList.h | 8 ++-- .../Actor/{Group => Social}/Group.cpp | 2 +- .../Actor/{Group => Social}/Group.h | 2 +- .../Actor/{Group => Social}/Linkshell.cpp | 0 .../Actor/{Group => Social}/Linkshell.h | 0 .../Manager/ContentGroupMgr.cpp | 0 .../Manager/ContentGroupMgr.h | 0 .../Manager/FreeCompanyMgr.cpp | 0 .../Manager/FreeCompanyMgr.h | 0 .../Actor/Social/Manager/FriendListMgr.cpp | 30 ++++++++++++++ .../Actor/Social/Manager/FriendListMgr.h | 37 +++++++++++++++++ .../{Group => Social}/Manager/GroupMgr.cpp | 11 ++++- .../{Group => Social}/Manager/GroupMgr.h | 10 ++--- .../Manager/LinkshellMgr.cpp | 0 .../{Group => Social}/Manager/LinkshellMgr.h | 0 .../{Group => Social}/Manager/PartyMgr.cpp | 0 .../{Group => Social}/Manager/PartyMgr.h | 0 .../Actor/{Group => Social}/Party.cpp | 0 .../Actor/{Group => Social}/Party.h | 0 .../Network/Handlers/PacketHandlers.cpp | 2 +- 29 files changed, 100 insertions(+), 64 deletions(-) delete mode 100644 src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.cpp delete mode 100644 src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.h rename src/servers/Server_Zone/Actor/{Group => Social}/ContentGroup.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/ContentGroup.h (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/FreeCompany.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/FreeCompany.h (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/FriendList.cpp (86%) rename src/servers/Server_Zone/Actor/{Group => Social}/FriendList.h (89%) rename src/servers/Server_Zone/Actor/{Group => Social}/Group.cpp (99%) rename src/servers/Server_Zone/Actor/{Group => Social}/Group.h (99%) rename src/servers/Server_Zone/Actor/{Group => Social}/Linkshell.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Linkshell.h (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/ContentGroupMgr.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/ContentGroupMgr.h (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/FreeCompanyMgr.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/FreeCompanyMgr.h (100%) create mode 100644 src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.cpp create mode 100644 src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.h rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/GroupMgr.cpp (56%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/GroupMgr.h (87%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/LinkshellMgr.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/LinkshellMgr.h (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/PartyMgr.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Manager/PartyMgr.h (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Party.cpp (100%) rename src/servers/Server_Zone/Actor/{Group => Social}/Party.h (100%) diff --git a/src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.cpp b/src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.cpp deleted file mode 100644 index 1293cfed..00000000 --- a/src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "../FriendList.h" -#include "FriendListMgr.h" diff --git a/src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.h b/src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.h deleted file mode 100644 index 1ac6376e..00000000 --- a/src/servers/Server_Zone/Actor/Group/Manager/FriendListMgr.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef _FRIENDLISTMGR_H -#define _FRIENDLISTMGR_H - -#include -#include - -#include -#include -#include - -#include - -namespace Core { -namespace Entity { -namespace Group { - -class FriendListMgr : public GroupMgr -{ -public: - FriendListMgr( GroupType type, uint32_t maxEntries ) : - GroupMgr( type, maxEntries ), - m_type( type ), m_maxEntries( maxEntries ) {}; - ~FriendListMgr() {}; - - GroupPtr findGroupByInviteIdForPlayer( uint64_t playerId ) const; - GroupPtr findGroupById( uint64_t groupId ) const; - -private: - GroupType m_type{ GroupType::None }; - uint64_t m_groupCount{ 0 }; - uint32_t m_maxEntries{ 0xFFFFFFFF }; - std::map< uint64_t, GroupPtr > m_groups; // < groupid, groupPtr > - std::map< uint64_t, uint64_t > m_invites; // < recipient, groupid > - virtual GroupPtr createGroup( PlayerPtr pOwner ) = 0; - -}; - -} -} -}; -#endif /* ! _FRIENDLISTMGR_H */ \ No newline at end of file diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/Server_Zone/Actor/Player.cpp index a3c63893..d17d2fc6 100644 --- a/src/servers/Server_Zone/Actor/Player.cpp +++ b/src/servers/Server_Zone/Actor/Player.cpp @@ -29,6 +29,9 @@ #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h" +#include "src/servers/Server_Zone/Actor/Social/FriendList.h" +#include "src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.h" + #include "src/servers/Server_Zone/Script/ScriptManager.h" #include "src/servers/Server_Zone/Inventory/Item.h" @@ -49,6 +52,8 @@ extern Core::ZoneMgr g_zoneMgr; extern Core::Data::ExdData g_exdData; extern Core::Scripting::ScriptManager g_scriptMgr; +extern Core::Entity::Social::FriendListMgr g_friendListMgr; + using namespace Core::Common; using namespace Core::Network::Packets; using namespace Core::Network::Packets::Server; @@ -300,7 +305,7 @@ void Core::Entity::Player::sendStats() queuePacket( statPacket ); } -Group::FriendListPtr Core::Entity::Player::getFriendsList() const +Social::FriendListPtr Core::Entity::Player::getFriendsList() const { return m_friendsList; } @@ -441,6 +446,8 @@ void Core::Entity::Player::setZone( uint32_t zoneId ) gcAffPacket.data().gcRank[2] = m_gcRank[2]; queuePacket( gcAffPacket ); + m_friendsList = g_friendListMgr.getPlayerFriendsList( getId() ); + m_itemLevel = getInventory()->calculateEquippedGearItemLevel(); sendItemLevel(); } diff --git a/src/servers/Server_Zone/Actor/Player.h b/src/servers/Server_Zone/Actor/Player.h index 35db1533..e51c6b01 100644 --- a/src/servers/Server_Zone/Actor/Player.h +++ b/src/servers/Server_Zone/Actor/Player.h @@ -5,7 +5,8 @@ #include #include -#include +#include +#include #include "Actor.h" #include "src/servers/Server_Zone/Inventory/Inventory.h" @@ -359,7 +360,7 @@ public: // Social-based ////////////////////////////////////////////////////////////////////////////////////////////////////// - Group::FriendListPtr getFriendsList() const; + Social::FriendListPtr getFriendsList() const; // Aetheryte / Action / Attribute bitmasks @@ -623,7 +624,7 @@ private: // Social-based - Group::FriendListPtr m_friendsList; + Social::FriendListPtr m_friendsList; uint8_t m_equipDisplayFlags; diff --git a/src/servers/Server_Zone/Actor/Group/ContentGroup.cpp b/src/servers/Server_Zone/Actor/Social/ContentGroup.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/ContentGroup.cpp rename to src/servers/Server_Zone/Actor/Social/ContentGroup.cpp diff --git a/src/servers/Server_Zone/Actor/Group/ContentGroup.h b/src/servers/Server_Zone/Actor/Social/ContentGroup.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/ContentGroup.h rename to src/servers/Server_Zone/Actor/Social/ContentGroup.h diff --git a/src/servers/Server_Zone/Actor/Group/FreeCompany.cpp b/src/servers/Server_Zone/Actor/Social/FreeCompany.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/FreeCompany.cpp rename to src/servers/Server_Zone/Actor/Social/FreeCompany.cpp diff --git a/src/servers/Server_Zone/Actor/Group/FreeCompany.h b/src/servers/Server_Zone/Actor/Social/FreeCompany.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/FreeCompany.h rename to src/servers/Server_Zone/Actor/Social/FreeCompany.h diff --git a/src/servers/Server_Zone/Actor/Group/FriendList.cpp b/src/servers/Server_Zone/Actor/Social/FriendList.cpp similarity index 86% rename from src/servers/Server_Zone/Actor/Group/FriendList.cpp rename to src/servers/Server_Zone/Actor/Social/FriendList.cpp index 5ceb720d..37f89bf4 100644 --- a/src/servers/Server_Zone/Actor/Group/FriendList.cpp +++ b/src/servers/Server_Zone/Actor/Social/FriendList.cpp @@ -14,10 +14,11 @@ extern Core::ServerZone g_serverZone; extern Core::Logger g_log; +using namespace Core::Entity; using namespace Core::Network::Packets; using namespace Core::Network::Packets::Server; -std::vector< PlayerEntry > Core::Entity::Group::FriendList::getFriendListEntries( uint16_t entryAmount ) +std::vector< PlayerEntry > Core::Entity::Social::FriendList::getFriendListEntries( uint16_t entryAmount ) { std::vector< PlayerEntry > entryList = {}; uint16_t limit = 0; diff --git a/src/servers/Server_Zone/Actor/Group/FriendList.h b/src/servers/Server_Zone/Actor/Social/FriendList.h similarity index 89% rename from src/servers/Server_Zone/Actor/Group/FriendList.h rename to src/servers/Server_Zone/Actor/Social/FriendList.h index 5b63b377..bc9503d2 100644 --- a/src/servers/Server_Zone/Actor/Group/FriendList.h +++ b/src/servers/Server_Zone/Actor/Social/FriendList.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ using namespace Core::Network::Packets::Server; namespace Core { namespace Entity { -namespace Group { +namespace Social { class FriendList; using FriendListPtr = boost::shared_ptr< FriendList >; @@ -28,7 +28,7 @@ class FriendList : public Group public: FriendList( uint64_t id, uint64_t ownerId, uint32_t maxCapacity, time_point createTime ) : Group( id, ownerId, maxCapacity, createTime ), - m_id( id ), m_ownerId( m_ownerId ), m_maxCapacity( maxCapacity ), m_createTime( createTime ) {}; + m_id( id ), m_ownerId( ownerId ), m_maxCapacity( maxCapacity ), m_createTime( createTime ) {}; ~FriendList() {}; @@ -50,8 +50,6 @@ public: bool isBlacklist() const; bool isContentGroup() const; - Core::Network::Packets::ZoneChannelPacket< FFXIVIpcSocialList > generateFriendsListPacket( PlayerPtr pPlayer ); - std::vector< Core::Network::Packets::Server::PlayerEntry > getFriendListEntries( uint16_t entryAmount ); diff --git a/src/servers/Server_Zone/Actor/Group/Group.cpp b/src/servers/Server_Zone/Actor/Social/Group.cpp similarity index 99% rename from src/servers/Server_Zone/Actor/Group/Group.cpp rename to src/servers/Server_Zone/Actor/Social/Group.cpp index 3be65ecf..d6761737 100644 --- a/src/servers/Server_Zone/Actor/Group/Group.cpp +++ b/src/servers/Server_Zone/Actor/Social/Group.cpp @@ -13,7 +13,7 @@ extern Core::ServerZone g_serverZone; -using namespace Core::Entity::Group; +using namespace Core::Entity::Social; // todo: i fuckin have no fuckin clue how to use group manager classes, why not just have a map of ? // todo: invite map in g_serverZone.getGroupMgr(GroupType) and look up diff --git a/src/servers/Server_Zone/Actor/Group/Group.h b/src/servers/Server_Zone/Actor/Social/Group.h similarity index 99% rename from src/servers/Server_Zone/Actor/Group/Group.h rename to src/servers/Server_Zone/Actor/Social/Group.h index 527e68f7..e17624ba 100644 --- a/src/servers/Server_Zone/Actor/Group/Group.h +++ b/src/servers/Server_Zone/Actor/Social/Group.h @@ -12,7 +12,7 @@ namespace Core { namespace Entity { -namespace Group { +namespace Social { class Group; using GroupPtr = boost::shared_ptr< Group >; diff --git a/src/servers/Server_Zone/Actor/Group/Linkshell.cpp b/src/servers/Server_Zone/Actor/Social/Linkshell.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Linkshell.cpp rename to src/servers/Server_Zone/Actor/Social/Linkshell.cpp diff --git a/src/servers/Server_Zone/Actor/Group/Linkshell.h b/src/servers/Server_Zone/Actor/Social/Linkshell.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Linkshell.h rename to src/servers/Server_Zone/Actor/Social/Linkshell.h diff --git a/src/servers/Server_Zone/Actor/Group/Manager/ContentGroupMgr.cpp b/src/servers/Server_Zone/Actor/Social/Manager/ContentGroupMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/ContentGroupMgr.cpp rename to src/servers/Server_Zone/Actor/Social/Manager/ContentGroupMgr.cpp diff --git a/src/servers/Server_Zone/Actor/Group/Manager/ContentGroupMgr.h b/src/servers/Server_Zone/Actor/Social/Manager/ContentGroupMgr.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/ContentGroupMgr.h rename to src/servers/Server_Zone/Actor/Social/Manager/ContentGroupMgr.h diff --git a/src/servers/Server_Zone/Actor/Group/Manager/FreeCompanyMgr.cpp b/src/servers/Server_Zone/Actor/Social/Manager/FreeCompanyMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/FreeCompanyMgr.cpp rename to src/servers/Server_Zone/Actor/Social/Manager/FreeCompanyMgr.cpp diff --git a/src/servers/Server_Zone/Actor/Group/Manager/FreeCompanyMgr.h b/src/servers/Server_Zone/Actor/Social/Manager/FreeCompanyMgr.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/FreeCompanyMgr.h rename to src/servers/Server_Zone/Actor/Social/Manager/FreeCompanyMgr.h diff --git a/src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.cpp b/src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.cpp new file mode 100644 index 00000000..77c237b3 --- /dev/null +++ b/src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.cpp @@ -0,0 +1,30 @@ +#include + +#include +#include + +#include "../Group.h" +#include "../FriendList.h" +#include "FriendListMgr.h" + +extern Core::Logger g_log; + +using namespace Core::Entity; + +Social::FriendListMgr::FriendListMgr() +{ + +} + +Social::FriendListPtr Social::FriendListMgr::getPlayerFriendsList( uint32_t playerId ) +{ + std::mt19937_64 engine( std::random_device{}( ) ); + std::uniform_int_distribution distribution; + auto ui64 = distribution( engine ); + + FriendList nFriendList( ui64, playerId, 200, std::chrono::steady_clock::now() ); + + FriendListPtr pFriendList = boost::make_shared< FriendList >( nFriendList ); + pFriendList->getCapacity(); + return pFriendList; +} \ No newline at end of file diff --git a/src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.h b/src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.h new file mode 100644 index 00000000..fb8b28fc --- /dev/null +++ b/src/servers/Server_Zone/Actor/Social/Manager/FriendListMgr.h @@ -0,0 +1,37 @@ +#ifndef _FRIENDLISTMGR_H +#define _FRIENDLISTMGR_H + +#include +#include + +#include +#include +#include +#include + +#include + +namespace Core { +namespace Entity { +namespace Social { + +class FriendListMgr +{ +public: + FriendListMgr(); + + FriendListPtr getPlayerFriendsList( uint32_t playerId ); + +private: + GroupType m_type{ GroupType::FriendList }; + uint64_t m_groupCount{ 0 }; + uint32_t m_maxEntries{ 0xFFFFFFFF }; + std::map< uint64_t, GroupPtr > m_groups; // < groupid, groupPtr > + std::map< uint64_t, uint64_t > m_invites; // < recipient, groupid > + +}; + +} +} +}; +#endif /* ! _FRIENDLISTMGR_H */ \ No newline at end of file diff --git a/src/servers/Server_Zone/Actor/Group/Manager/GroupMgr.cpp b/src/servers/Server_Zone/Actor/Social/Manager/GroupMgr.cpp similarity index 56% rename from src/servers/Server_Zone/Actor/Group/Manager/GroupMgr.cpp rename to src/servers/Server_Zone/Actor/Social/Manager/GroupMgr.cpp index ec4bc16a..70d86f03 100644 --- a/src/servers/Server_Zone/Actor/Group/Manager/GroupMgr.cpp +++ b/src/servers/Server_Zone/Actor/Social/Manager/GroupMgr.cpp @@ -1,7 +1,14 @@ #include "../Group.h" #include "GroupMgr.h" -Core::Entity::Group::GroupPtr Core::Entity::Group::GroupMgr::findGroupByInviteIdForPlayer( uint64_t playerId ) const +using namespace Core::Entity; + +Social::GroupMgr::GroupMgr() +{ + +} + +Social::GroupPtr Social::GroupMgr::findGroupByInviteIdForPlayer( uint64_t playerId ) const { auto it = m_invites.find( playerId ); if( it != m_invites.end() ) @@ -11,7 +18,7 @@ Core::Entity::Group::GroupPtr Core::Entity::Group::GroupMgr::findGroupByInviteId return nullptr; } -Core::Entity::Group::GroupPtr Core::Entity::Group::GroupMgr::findGroupById( uint64_t groupId ) const +Social::GroupPtr Core::Entity::Social::GroupMgr::findGroupById( uint64_t groupId ) const { auto it = m_groups.find( groupId ); if( it != m_groups.end() ) diff --git a/src/servers/Server_Zone/Actor/Group/Manager/GroupMgr.h b/src/servers/Server_Zone/Actor/Social/Manager/GroupMgr.h similarity index 87% rename from src/servers/Server_Zone/Actor/Group/Manager/GroupMgr.h rename to src/servers/Server_Zone/Actor/Social/Manager/GroupMgr.h index 521a72df..4e519b33 100644 --- a/src/servers/Server_Zone/Actor/Group/Manager/GroupMgr.h +++ b/src/servers/Server_Zone/Actor/Social/Manager/GroupMgr.h @@ -6,18 +6,16 @@ #include #include -#include +#include namespace Core { namespace Entity { -namespace Group { +namespace Social { class GroupMgr : public boost::enable_shared_from_this< GroupMgr > { public: - GroupMgr( GroupType type, uint32_t maxEntries ) : - m_type( type ), m_maxEntries( maxEntries ) {}; - ~GroupMgr() {}; + GroupMgr(); GroupPtr findGroupByInviteIdForPlayer( uint64_t playerId ) const; GroupPtr findGroupById( uint64_t groupId ) const; @@ -28,7 +26,7 @@ private: uint32_t m_maxEntries{ 0xFFFFFFFF }; std::map< uint64_t, GroupPtr > m_groups; std::map< uint64_t, uint64_t > m_invites; // < recipient, groupid > - virtual GroupPtr createGroup( PlayerPtr pOwner ) = 0; + //virtual GroupPtr createGroup( PlayerPtr pOwner ) = 0; /* friend virtual Core::Network::Packets::GamePacketPtr Core::Entity::Group::Group::addMember( PlayerPtr pSender, PlayerPtr pRecipient, uint64_t senderId = 0, uint64_t recipientId = 0 ); diff --git a/src/servers/Server_Zone/Actor/Group/Manager/LinkshellMgr.cpp b/src/servers/Server_Zone/Actor/Social/Manager/LinkshellMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/LinkshellMgr.cpp rename to src/servers/Server_Zone/Actor/Social/Manager/LinkshellMgr.cpp diff --git a/src/servers/Server_Zone/Actor/Group/Manager/LinkshellMgr.h b/src/servers/Server_Zone/Actor/Social/Manager/LinkshellMgr.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/LinkshellMgr.h rename to src/servers/Server_Zone/Actor/Social/Manager/LinkshellMgr.h diff --git a/src/servers/Server_Zone/Actor/Group/Manager/PartyMgr.cpp b/src/servers/Server_Zone/Actor/Social/Manager/PartyMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/PartyMgr.cpp rename to src/servers/Server_Zone/Actor/Social/Manager/PartyMgr.cpp diff --git a/src/servers/Server_Zone/Actor/Group/Manager/PartyMgr.h b/src/servers/Server_Zone/Actor/Social/Manager/PartyMgr.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Manager/PartyMgr.h rename to src/servers/Server_Zone/Actor/Social/Manager/PartyMgr.h diff --git a/src/servers/Server_Zone/Actor/Group/Party.cpp b/src/servers/Server_Zone/Actor/Social/Party.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Party.cpp rename to src/servers/Server_Zone/Actor/Social/Party.cpp diff --git a/src/servers/Server_Zone/Actor/Group/Party.h b/src/servers/Server_Zone/Actor/Social/Party.h similarity index 100% rename from src/servers/Server_Zone/Actor/Group/Party.h rename to src/servers/Server_Zone/Actor/Social/Party.h diff --git a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp index 7962ec8f..a3c09d7f 100644 --- a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp @@ -467,7 +467,7 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket break; g_log.debug( "aaa" + std::to_string( i ) + ": " + member.second.name ); - listPacket.data().entries[i] = Core::Entity::Group::Group::generatePlayerEntry( member.second ); + listPacket.data().entries[i] = Core::Entity::Social::Group::generatePlayerEntry( member.second ); i++; }