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

Merge branch 'action' into develop_c

Browse source
This commit is contained in:
collett 2020-01-06 00:26:25 +09:00
commit 0414a3075d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/world/Action/Action.cpp
View file

@ -393,8 +393,8 @@ void Action::Action::execute()
// ignore it otherwise (ogcds, etc.) // ignore it otherwise (ogcds, etc.)
if( !m_actionData->preservesCombo ) if( !m_actionData->preservesCombo )
{ {
// potential combo starter or correct combo from last action // potential combo starter or correct combo from last action, must hit something to progress combo
if( ( !isComboAction() || isCorrectCombo() ) ) if( !m_hitActors.empty() && ( !isComboAction() || isCorrectCombo() ) )
{ {
m_pSource->setLastComboActionId( getId() ); m_pSource->setLastComboActionId( getId() );
} }