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

Merge pull request #188 from goaaats/work

Browse source 
Add definition for legacy mark equip flag, fix logout dc
This commit is contained in:
Mordred 2017-12-02 23:58:22 +01:00 • committed by GitHub
commit 1edfc8490d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/servers/Server_Common/Common.h
View file

@ -792,6 +792,7 @@ namespace Common {
HideNothing = 0x0, HideNothing = 0x0,
HideHead = 0x1, HideHead = 0x1,
HideWeapon = 0x2, HideWeapon = 0x2,
LegacyMark = 0x4,
Visor = 0x40, Visor = 0x40,
}; };

1
src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
View file

@ -286,6 +286,7 @@ void Core::Network::GameConnection::updatePositionHandler( const Packets::GamePa
void Core::Network::GameConnection::reqEquipDisplayFlagsHandler( const Packets::GamePacket& inPacket, void Core::Network::GameConnection::reqEquipDisplayFlagsHandler( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer ) Entity::PlayerPtr pPlayer )
{ {
g_log.info( "[" + std::to_string( pPlayer->getId() ) + "] Setting EquipDisplayFlags to " + std::to_string( inPacket.getValAt< uint8_t >( 0x20 ) ) );
pPlayer->setEquipDisplayFlags( inPacket.getValAt< uint8_t >( 0x20 ) ); pPlayer->setEquipDisplayFlags( inPacket.getValAt< uint8_t >( 0x20 ) );
} }

2
src/servers/Server_Zone/ServerZone.cpp
View file

@ -292,7 +292,7 @@ void Core::ServerZone::mainLoop()
auto pPlayer = it->second->getPlayer(); auto pPlayer = it->second->getPlayer();
// remove session of players marked for removel ( logoff / kick ) // remove session of players marked for removel ( logoff / kick )
if( pPlayer->isMarkedForRemoval() && diff > 1 ) if( pPlayer->isMarkedForRemoval() && diff > 5 )
{ {
it->second->close(); it->second->close();
// if( it->second.unique() ) // if( it->second.unique() )