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

Adjusted wrong casttime for eventactions, needs fixing in ex.json

Browse source
This commit is contained in:
Mordred 2018-02-04 02:26:02 +01:00
parent ee5196b372
commit c176c88ee2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 )

2
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;