From e450917cd01fbf4509ba2b8c4a40678987d52a0d Mon Sep 17 00:00:00 2001 From: Maru Date: Thu, 25 Jan 2018 15:32:33 -0200 Subject: [PATCH] Haha everything broke haha --- src/servers/sapphire_zone/Actor/Player.cpp | 8 +++----- src/servers/sapphire_zone/Actor/Player.h | 8 ++++---- .../Network/Handlers/PacketHandlers.cpp | 8 ++++---- .../sapphire_zone/Social/FriendList.cpp | 16 ++++++++-------- src/servers/sapphire_zone/Social/FriendList.h | 12 ++++++------ src/servers/sapphire_zone/Social/Group.cpp | 18 +++++++++--------- src/servers/sapphire_zone/Social/Group.h | 8 ++++---- .../sapphire_zone/Social/Manager/SocialMgr.h | 2 +- 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp index eeed4b3c..177f05be 100644 --- a/src/servers/sapphire_zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -29,10 +29,9 @@ #include "Script/ScriptManager.h" -#include "src/servers/Server_Zone/Social/FriendList.h" -#include "src/servers/Server_Zone/Actor/Manager/FriendListMgr.h" +#include "Social/FriendList.h" -#include "src/servers/Server_Zone/Script/ScriptManager.h" +#include "Script/ScriptManager.h" #include "Inventory/Item.h" #include "Inventory/Inventory.h" @@ -445,9 +444,8 @@ void Core::Entity::Player::setZone( uint32_t zoneId ) queuePacket( gcAffPacket ); //todo: change this to extern, global obj - Core::Entity::Social::FriendListMgr fListMgr = {}; - m_friendsListId = fListMgr.fetchPlayerFriendsList( getId() ); + m_friendsListId = g_friendListMgr.fetchPlayerFriendsList( getId() ); m_itemLevel = getInventory()->calculateEquippedGearItemLevel(); sendItemLevel(); diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h index 1f4dabc7..da41e917 100644 --- a/src/servers/sapphire_zone/Actor/Player.h +++ b/src/servers/sapphire_zone/Actor/Player.h @@ -4,10 +4,10 @@ #include "Forwards.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "Actor.h" #include "Inventory/Inventory.h" diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index 1b04a044..125104f4 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -481,14 +481,14 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket auto playerFriendsList = g_friendListMgr.findGroupById( player.getFriendsListId() ); // todo: move this garbage else fucking where - for ( auto member : playerFriendsList->getMembers() ) + for ( auto member : playerFriendsList.getMembers() ) { // more elegant way to break over list entries pls if ( i == 10 ) break; g_log.debug( "aaa" + std::to_string( i ) + ": " + member.second.name ); - listPacket.data().entries[i] = Core::Entity::Social::Group::generatePlayerEntry( member.second ); + listPacket.data().entries[i] = Core::Social::Group::generatePlayerEntry( member.second ); i++; } @@ -692,11 +692,11 @@ void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePac auto recipientFriendsList = g_friendListMgr.findGroupById( pRecipient->getFriendsListId() ); - auto senderResultPacket = recipientFriendsList->inviteMember( player.getAsPlayer(), pRecipient, player.getId(), pRecipient->getId() ); + auto senderResultPacket = recipientFriendsList.inviteMember( player.getAsPlayer(), pRecipient, player.getId(), pRecipient->getId() ); player.queuePacket( senderResultPacket ); - if ( recipientFriendsList->isFriendList() ) + if ( recipientFriendsList.isFriendList() ) { g_log.debug( "he HAA HAAA" ); } diff --git a/src/servers/sapphire_zone/Social/FriendList.cpp b/src/servers/sapphire_zone/Social/FriendList.cpp index 35ae351b..aa95d721 100644 --- a/src/servers/sapphire_zone/Social/FriendList.cpp +++ b/src/servers/sapphire_zone/Social/FriendList.cpp @@ -1,14 +1,14 @@ #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "FriendList.h" #include "Group.h" diff --git a/src/servers/sapphire_zone/Social/FriendList.h b/src/servers/sapphire_zone/Social/FriendList.h index 16acdc87..3d55f99d 100644 --- a/src/servers/sapphire_zone/Social/FriendList.h +++ b/src/servers/sapphire_zone/Social/FriendList.h @@ -1,12 +1,12 @@ #ifndef _FRIENDLIST_H #define _FRIENDLIST_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/servers/sapphire_zone/Social/Group.cpp b/src/servers/sapphire_zone/Social/Group.cpp index cc7f4df4..c026dda1 100644 --- a/src/servers/sapphire_zone/Social/Group.cpp +++ b/src/servers/sapphire_zone/Social/Group.cpp @@ -1,15 +1,15 @@ #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Group.h" extern Core::ServerZone g_serverZone; diff --git a/src/servers/sapphire_zone/Social/Group.h b/src/servers/sapphire_zone/Social/Group.h index b610ca9b..219fe3fc 100644 --- a/src/servers/sapphire_zone/Social/Group.h +++ b/src/servers/sapphire_zone/Social/Group.h @@ -1,10 +1,10 @@ #ifndef _GROUP_H #define _GROUP_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/servers/sapphire_zone/Social/Manager/SocialMgr.h b/src/servers/sapphire_zone/Social/Manager/SocialMgr.h index 99895e2d..909e814b 100644 --- a/src/servers/sapphire_zone/Social/Manager/SocialMgr.h +++ b/src/servers/sapphire_zone/Social/Manager/SocialMgr.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include namespace Core {