Fix for missed clash on swings (#120)

fixing Battle Mode clash when swings continue per discussion on TRA
profezzorn · Nov 5, 2020 · a84eb3a · a84eb3a
1 parent d00e312
commit a84eb3a
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/props/saber_fett263_buttons.h b/props/saber_fett263_buttons.h
@@ -645,11 +645,10 @@ SaberFett263Buttons() : PropBase() {}
         if (!battle_mode_) return false;
         clash_impact_millis_ = millis();
         swing_blast_ = false;
-        if (!swinging_) {
-          SaberBase::SetLockup(SaberBase::LOCKUP_NORMAL);
-          auto_lockup_on_ = true;
-          SaberBase::DoBeginLockup();
-        }
+        if (swinging_) return false;
+        SaberBase::SetLockup(SaberBase::LOCKUP_NORMAL);
+        auto_lockup_on_ = true;
+        SaberBase::DoBeginLockup();
         return true;
 
       case EVENTID(BUTTON_NONE, EVENT_STAB, MODE_ON):