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

Fixed state flags

Browse source
This commit is contained in:
Mordred 2018-02-04 00:43:36 +01:00
parent 11aaa596b9
commit ee5196b372
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Common.h
View file

@ -388,7 +388,6 @@ namespace Common {
enum struct PlayerStateFlag : uint8_t enum struct PlayerStateFlag : uint8_t
{ {
SomeFlag,
NoCombat, NoCombat,
Combat, Combat,
Casting, Casting,

9
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -829,11 +829,10 @@ struct FFXIVIpcActorOwner : FFXIVIpcBasePacket<ActorOwner>
*/ */
struct FFXIVIpcPlayerStateFlags : FFXIVIpcBasePacket<PlayerStateFlags> struct FFXIVIpcPlayerStateFlags : FFXIVIpcBasePacket<PlayerStateFlags>
{ {
/* 0000 */ uint16_t padding; uint8_t flags[7];
/* 0002 */ uint8_t flags[7]; uint8_t padding1[3];
/* 0009 */ uint8_t padding1[3]; uint32_t padding2;
/* 000C */ uint32_t padding2; uint16_t padding;
}; };
/** /**

4
src/servers/sapphire_zone/Action/EventAction.cpp
View file

@ -53,7 +53,7 @@ void Core::Action::EventAction::onStart()
if( m_pSource->isPlayer() ) if( m_pSource->isPlayer() )
{ {
m_pSource->sendToInRangeSet( control, true ); m_pSource->sendToInRangeSet( control, true );
m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::SomeFlag ); m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::Occupied2 );
} }
else else
m_pSource->sendToInRangeSet( control ); m_pSource->sendToInRangeSet( control );
@ -82,7 +82,7 @@ void Core::Action::EventAction::onFinish()
if( m_pSource->isPlayer() ) if( m_pSource->isPlayer() )
{ {
m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::SomeFlag ); m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied2 );
m_pSource->sendToInRangeSet( control, true ); m_pSource->sendToInRangeSet( control, true );
} }
else else