mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 07:37:45 +00:00
Code Activity

Enforcing style rules

Browse source
This commit is contained in:
Mordred 2017-11-28 17:29:06 +01:00
parent 98fe5f7bbd
commit ff0f793cb9
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/servers/Server_Zone/Network/GameConnection.cpp
View file

@ -100,10 +100,7 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive,
} }
Core::Network::GameConnection::~GameConnection() Core::Network::GameConnection::~GameConnection() = default;
{
}
// overwrite the parents onConnect for our game socket needs // overwrite the parents onConnect for our game socket needs
@ -146,7 +143,8 @@ void Core::Network::GameConnection::OnRecv( std::vector< uint8_t > & buffer )
// Dissect packet list // Dissect packet list
std::vector< Packets::FFXIVARR_PACKET_RAW > packetList; std::vector< Packets::FFXIVARR_PACKET_RAW > packetList;
const auto packetResult = Packets::getPackets(buffer, sizeof(struct FFXIVARR_PACKET_HEADER), packetHeader, packetList); const auto packetResult = Packets::getPackets( buffer, sizeof( struct FFXIVARR_PACKET_HEADER ),
packetHeader, packetList );
if( packetResult == Incomplete ) if( packetResult == Incomplete )
{ {
@ -391,7 +389,8 @@ void Core::Network::GameConnection::handlePackets( const Core::Network::Packets:
} }
session = g_serverZone.getSession( playerId ); session = g_serverZone.getSession( playerId );
} }
else if( !session->isValid() || ( session->getPlayer() && session->getPlayer()->getLastPing() != 0 ) ) //TODO: Catch more things in lobby and send real errors //TODO: Catch more things in lobby and send real errors
else if( !session->isValid() || ( session->getPlayer() && session->getPlayer()->getLastPing() != 0 ) )
{ {
g_log.error( "[" + std::string(id) + "] Session INVALID, disconnecting" ); g_log.error( "[" + std::string(id) + "] Session INVALID, disconnecting" );
Disconnect(); Disconnect();