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

sit now works correctly when doing /sit while sitting

Browse source
This commit is contained in:
NotAdam 2018-07-11 20:42:49 +10:00
parent 467bcf4163
commit c4f35b0753
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Exd/ExdDataGenerated.cpp
View file

@ -1426,6 +1426,7 @@ Core::Data::Emote::Emote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData
name = exdData->getField< std::string >( row, 0 ); name = exdData->getField< std::string >( row, 0 );
emoteCategory = exdData->getField< uint8_t >( row, 11 ); emoteCategory = exdData->getField< uint8_t >( row, 11 );
emoteMode = exdData->getField< uint8_t >( row, 12 ); emoteMode = exdData->getField< uint8_t >( row, 12 );
hasCancelEmote = exdData->getField< bool >( row, 15 );
textCommand = exdData->getField< int32_t >( row, 18 ); textCommand = exdData->getField< int32_t >( row, 18 );
icon = exdData->getField< uint16_t >( row, 19 ); icon = exdData->getField< uint16_t >( row, 19 );
logMessageTargeted = exdData->getField< uint16_t >( row, 20 ); logMessageTargeted = exdData->getField< uint16_t >( row, 20 );

1
src/common/Exd/ExdDataGenerated.h
View file

@ -1604,6 +1604,7 @@ struct Emote
uint16_t logMessageTargeted; uint16_t logMessageTargeted;
uint16_t logMessageUntargeted; uint16_t logMessageUntargeted;
uint8_t emoteMode; uint8_t emoteMode;
bool hasCancelEmote;
Emote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); Emote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData );
}; };

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

@ -158,9 +158,10 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
player.setAutoattack( false ); player.setAutoattack( false );
player.setPersistentEmote( emoteData->emoteMode ); player.setPersistentEmote( emoteData->emoteMode );
player.setStatus( Entity::Chara::ActorStatus::EmoteMode ); player.setStatus( Entity::Chara::ActorStatus::EmoteMode );
player.sendToInRangeSet( player.sendToInRangeSet(
boost::make_shared< ActorControlPacket142 >( player.getId(), ActorControlType::SetStatus, boost::make_shared< ActorControlPacket142 >( player.getId(), ActorControlType::SetStatus,
static_cast< uint8_t >( Entity::Chara::ActorStatus::EmoteMode ) ), true ); static_cast< uint8_t >( Entity::Chara::ActorStatus::EmoteMode ), emoteData->hasCancelEmote ? 1 : 0 ), true );
} }
player.emote( emoteId, targetId, isSilent ); player.emote( emoteId, targetId, isSilent );