From c319cb012c59b71f3633a9eb7e2e900ee22a81d2 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 6 Jan 2020 00:25:42 +0900
Subject: [PATCH] combo fix

---
 src/world/Action/Action.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 20ce9ab8..6c13d8cb 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -393,8 +393,8 @@ void Action::Action::execute()
   // ignore it otherwise (ogcds, etc.)
   if( !m_actionData->preservesCombo )
   {
-    // potential combo starter or correct combo from last action
-    if( ( !isComboAction() || isCorrectCombo() ) )
+    // potential combo starter or correct combo from last action, must hit something to progress combo
+    if( !m_hitActors.empty() && ( !isComboAction() || isCorrectCombo() ) )
     {
       m_pSource->setLastComboActionId( getId() );
     }