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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Adam 2018-02-04 16:40:47 +11:00
commit 42dac4f104
4 changed files with 8 additions and 10 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,

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

@ -1432,7 +1432,7 @@
auto row = exdData->m_EventActionDat.get_row( row_id ); auto row = exdData->m_EventActionDat.get_row( row_id );
name = exdData->getField< std::string >( row, 0 ); name = exdData->getField< std::string >( row, 0 );
icon = exdData->getField< uint16_t >( row, 1 ); icon = exdData->getField< uint16_t >( row, 1 );
castTime = exdData->getField< uint16_t >( row, 3 ); castTime = exdData->getField< uint8_t >( row, 2 );
} }
Core::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) Core::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Core::Data::ExdDataGenerated* exdData )

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;
}; };
/** /**

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

@ -28,7 +28,7 @@ Core::Action::EventAction::EventAction( Entity::ActorPtr pActor, uint32_t eventI
m_handleActionType = HandleActionType::Event; m_handleActionType = HandleActionType::Event;
m_eventId = eventId; m_eventId = eventId;
m_id = action; m_id = action;
m_castTime = g_exdDataGen.getEventAction( action )->castTime * 100; // TODO: Add security checks. m_castTime = g_exdDataGen.getEventAction( action )->castTime * 1000; // TODO: Add security checks.
m_onActionFinishClb = finishRef; m_onActionFinishClb = finishRef;
m_onActionInterruptClb = interruptRef; m_onActionInterruptClb = interruptRef;
m_pSource = pActor; m_pSource = pActor;
@ -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