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

Haha everything broke haha

Browse source
This commit is contained in:
Maru 2018-01-25 15:32:33 -02:00
parent e24791b59f
commit e450917cd0
8 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/servers/sapphire_zone/Actor/Player.cpp
View file

@ -29,10 +29,9 @@
#include "Script/ScriptManager.h" #include "Script/ScriptManager.h"
#include "src/servers/Server_Zone/Social/FriendList.h" #include "Social/FriendList.h"
#include "src/servers/Server_Zone/Actor/Manager/FriendListMgr.h"
#include "src/servers/Server_Zone/Script/ScriptManager.h" #include "Script/ScriptManager.h"
#include "Inventory/Item.h" #include "Inventory/Item.h"
#include "Inventory/Inventory.h" #include "Inventory/Inventory.h"
@ -445,9 +444,8 @@ void Core::Entity::Player::setZone( uint32_t zoneId )
queuePacket( gcAffPacket ); queuePacket( gcAffPacket );
//todo: change this to extern, global obj //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(); m_itemLevel = getInventory()->calculateEquippedGearItemLevel();
sendItemLevel(); sendItemLevel();

8
src/servers/sapphire_zone/Actor/Player.h
View file

@ -4,10 +4,10 @@
#include "Forwards.h" #include "Forwards.h"
#include <Server_Common/Common.h> #include <common/Common.h>
#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h> #include <common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <Server_Zone/Social/FriendList.h> #include <sapphire_zone/Social/FriendList.h>
#include <Server_Common/Common.h> #include <common/Common.h>
#include "Actor.h" #include "Actor.h"
#include "Inventory/Inventory.h" #include "Inventory/Inventory.h"

8
src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
View file

@ -481,14 +481,14 @@ void Core::Network::GameConnection::socialListHandler( const Packets::GamePacket
auto playerFriendsList = g_friendListMgr.findGroupById( player.getFriendsListId() ); auto playerFriendsList = g_friendListMgr.findGroupById( player.getFriendsListId() );
// todo: move this garbage else fucking where // 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 // more elegant way to break over list entries pls
if ( i == 10 ) if ( i == 10 )
break; break;
g_log.debug( "aaa" + std::to_string( i ) + ": " + member.second.name ); 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++; i++;
} }
@ -692,11 +692,11 @@ void Core::Network::GameConnection::socialReqSendHandler( const Packets::GamePac
auto recipientFriendsList = g_friendListMgr.findGroupById( pRecipient->getFriendsListId() ); 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 ); player.queuePacket( senderResultPacket );
if ( recipientFriendsList->isFriendList() ) if ( recipientFriendsList.isFriendList() )
{ {
g_log.debug( "he HAA HAAA" ); g_log.debug( "he HAA HAAA" );
} }

16
src/servers/sapphire_zone/Social/FriendList.cpp
View file

@ -1,14 +1,14 @@
#include <cassert> #include <cassert>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <src/servers/Server_Common/Common.h> #include <common/Common.h>
#include <Server_Common/Network/PacketDef/Ipcs.h> #include <common/Network/PacketDef/Ipcs.h>
#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h> #include <common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <src/servers/Server_Common/Logging/Logger.h> #include <common/Logging/Logger.h>
#include <Server_Zone/Actor/Actor.h> #include <sapphire_zone/Actor/Actor.h>
#include <Server_Zone/Actor/Player.h> #include <sapphire_zone/Actor/Player.h>
#include <Server_Zone/ServerZone.h> #include <sapphire_zone/ServerZone.h>
#include <Server_Common/Network/GamePacketNew.h> #include <common/Network/GamePacketNew.h>
#include "FriendList.h" #include "FriendList.h"
#include "Group.h" #include "Group.h"

12
src/servers/sapphire_zone/Social/FriendList.h
View file

@ -1,12 +1,12 @@
#ifndef _FRIENDLIST_H #ifndef _FRIENDLIST_H
#define _FRIENDLIST_H #define _FRIENDLIST_H
#include <src/servers/Server_Common/Common.h> #include <common/Common.h>
#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h> #include <common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <Server_Common/Network/GamePacketNew.h> #include <common/Network/GamePacketNew.h>
#include <Server_Common/Forwards.h> #include <common/Forwards.h>
#include <Server_Zone/Social/Group.h> #include <sapphire_zone/Social/Group.h>
#include <Server_Zone/Forwards.h> #include <sapphire_zone/Forwards.h>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <set> #include <set>
#include <cstdint> #include <cstdint>

18
src/servers/sapphire_zone/Social/Group.cpp
View file

@ -1,15 +1,15 @@
#include <cassert> #include <cassert>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <Server_Common/Logging/Logger.h> #include <common/Logging/Logger.h>
#include <Server_Zone/Session.h> #include <sapphire_zone/Session.h>
#include <Server_Common/Network/PacketDef/Ipcs.h> #include <common/Network/PacketDef/Ipcs.h>
#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h> #include <common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <Server_Zone/Actor/Actor.h> #include <sapphire_zone/Actor/Actor.h>
#include <Server_Zone/Actor/Player.h> #include <sapphire_zone/Actor/Player.h>
#include <Server_Zone/ServerZone.h> #include <sapphire_zone/ServerZone.h>
#include <Server_Zone/Zone/Zone.h> #include <sapphire_zone/Zone/Zone.h>
#include <Server_Common/Network/GamePacketNew.h> #include <common/Network/GamePacketNew.h>
#include "Group.h" #include "Group.h"
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;

8
src/servers/sapphire_zone/Social/Group.h
View file

@ -1,10 +1,10 @@
#ifndef _GROUP_H #ifndef _GROUP_H
#define _GROUP_H #define _GROUP_H
#include <Server_Common/Common.h> #include <common/Common.h>
#include <Server_Common/Network/PacketDef/Zone/ServerZoneDef.h> #include <common/Network/PacketDef/Zone/ServerZoneDef.h>
#include <Server_Common/Forwards.h> #include <common/Forwards.h>
#include <Server_Zone/Forwards.h> #include <sapphire_zone/Forwards.h>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <set> #include <set>
#include <cstdint> #include <cstdint>

2
src/servers/sapphire_zone/Social/Manager/SocialMgr.h
View file

@ -5,7 +5,7 @@
#include <cstdint> #include <cstdint>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <Server_Zone/Forwards.h> #include <sapphire_zone/Forwards.h>
#include <Social/Group.h> #include <Social/Group.h>
namespace Core { namespace Core {