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

fix sitting animating incorrectly for other clients, fixes #329

Browse source
This commit is contained in:
NotAdam 2018-07-12 20:55:46 +10:00
parent 0305777e38
commit a1ec09db72
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Network/CommonActorControl.h
View file

@ -18,7 +18,6 @@ namespace Core {
enum ActorControlType : uint16_t enum ActorControlType : uint16_t
{ {
ToggleWeapon = 0x00, ToggleWeapon = 0x00,
ToggleAutoAttack = 0x01,
SetStatus = 0x02, SetStatus = 0x02,
CastStart = 0x03, CastStart = 0x03,
ToggleAggro = 0x04, ToggleAggro = 0x04,

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

@ -150,6 +150,8 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
if( !emoteData ) if( !emoteData )
return; return;
player.emote( emoteId, targetId, isSilent );
bool isPersistent = emoteData->emoteMode != 0; bool isPersistent = emoteData->emoteMode != 0;
if( isPersistent ) if( isPersistent )
@ -164,8 +166,6 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
static_cast< uint8_t >( Entity::Chara::ActorStatus::EmoteMode ), emoteData->hasCancelEmote ? 1 : 0 ), true ); static_cast< uint8_t >( Entity::Chara::ActorStatus::EmoteMode ), emoteData->hasCancelEmote ? 1 : 0 ), true );
} }
player.emote( emoteId, targetId, isSilent );
if( emoteData->drawsWeapon ) if( emoteData->drawsWeapon )
{ {
player.setStance( Entity::Chara::Stance::Active ); player.setStance( Entity::Chara::Stance::Active );