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

Clear last combo action id if the combo breaks.

Browse source
This commit is contained in:
collett 2020-01-02 19:51:19 +09:00
parent 28a88e5a96
commit 482745624c
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -354,9 +354,17 @@ void Action::Action::execute()
// set currently casted action as the combo action if it interrupts a combo // set currently casted action as the combo action if it interrupts a combo
// ignore it otherwise (ogcds, etc.) // ignore it otherwise (ogcds, etc.)
if( !m_actionData->preservesCombo && ( !isComboAction() || isCorrectCombo() ) ) if( !m_actionData->preservesCombo )
{ {
m_pSource->setLastComboActionId( getId() ); // potential combo starter or correct combo from last action
if ( ( !isComboAction() || isCorrectCombo() ) )
{
m_pSource->setLastComboActionId( getId() );
}
else // clear last combo action if the combo breaks
{
m_pSource->setLastComboActionId( 0 );
}
} }
} }