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

Merge pull request #749 from hkAlice/threepointoh

Browse source 
[3.0] revert sheet check for action and fix combo;
This commit is contained in:
Mordred 2022-01-13 15:47:29 +01:00 • committed by GitHub
commit daf9ff30d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -432,7 +432,7 @@ 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->data().ComboContinue ) if( !m_actionData->data().ComboContinue )
{ {
// potential combo starter or correct combo from last action, must hit something to progress combo // potential combo starter or correct combo from last action, must hit something to progress combo
if( !m_hitActors.empty() && ( !isComboAction() || isCorrectCombo() ) ) if( !m_hitActors.empty() && ( !isComboAction() || isCorrectCombo() ) )
@ -559,7 +559,7 @@ void Action::Action::buildEffects()
shouldRestoreMP = false; shouldRestoreMP = false;
} }
if( m_actionData->data().ComboContinue ) // we need something like m_actionData->hasNextComboAction if( !m_actionData->data().ComboContinue ) // we need something like m_actionData->hasNextComboAction
{ {
m_effectBuilder->startCombo( m_pSource, getId() ); // this is on all targets hit m_effectBuilder->startCombo( m_pSource, getId() ); // this is on all targets hit
} }