From a84eb3ac8c303026efec18d88e90b18d20a5c6f1 Mon Sep 17 00:00:00 2001
From: fdarosa2663 <fernando_darosa@hotmail.com>
Date: Mon, 2 Nov 2020 17:32:55 -0500
Subject: [PATCH] Fix for missed clash on swings (#120)

fixing Battle Mode clash when swings continue per discussion on TRA
---
 props/saber_fett263_buttons.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/props/saber_fett263_buttons.h b/props/saber_fett263_buttons.h
index c5c08647f..19984b346 100644
--- 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):