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

#329 Fixed relogging while persistent emote is on ( restting state to idle )

Browse source
This commit is contained in:
Mordred 2018-07-09 22:34:56 +02:00
parent afbb247e1c
commit 3dcb7c3629
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/servers/sapphire_zone/Actor/PlayerSql.cpp
View file

@ -125,6 +125,10 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
m_birthDay = res->getUInt8( "BirthDay" ); m_birthDay = res->getUInt8( "BirthDay" );
m_birthMonth = res->getUInt8( "BirthMonth" ); m_birthMonth = res->getUInt8( "BirthMonth" );
m_status = static_cast< ActorStatus >( res->getUInt( "Status" ) ); m_status = static_cast< ActorStatus >( res->getUInt( "Status" ) );
if( m_status == Entity::Chara::ActorStatus::EmoteMode )
m_status = Entity::Chara::ActorStatus::Idle;
m_class = static_cast< ClassJob >( res->getUInt( "Class" ) ); m_class = static_cast< ClassJob >( res->getUInt( "Class" ) );
m_homePoint = res->getUInt8( "Homepoint" ); m_homePoint = res->getUInt8( "Homepoint" );

1
src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -175,6 +175,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
{ {
player.setPersistentEmote( 0 ); player.setPersistentEmote( 0 );
player.emoteInterrupt(); player.emoteInterrupt();
player.setStatus( Entity::Chara::ActorStatus::Idle );
auto pSetStatusPacket = boost::make_shared< ActorControlPacket142 >( player.getId(), auto pSetStatusPacket = boost::make_shared< ActorControlPacket142 >( player.getId(),
SetStatus, SetStatus,
static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ); static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) );