From a9be3b77db0f8da9d8787b82aeb0f0234e487995 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Thu, 2 Sep 2021 19:48:30 -0400
Subject: [PATCH] Removed ability to 'droideka' through dungeons.

---
 common/src/states/roll.rs | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/common/src/states/roll.rs b/common/src/states/roll.rs
index 5be93f86b4..d91e0526f9 100644
--- a/common/src/states/roll.rs
+++ b/common/src/states/roll.rs
@@ -97,17 +97,12 @@ impl CharacterBehavior for Data {
                         ..*self
                     });
                 } else {
-                    // Keeps rolling if sufficient energy, else transitions to recover section of
-                    // stage
-                    if input_is_pressed(data, self.static_data.ability_info.input) {
-                        reset_state(self, data, &mut update);
-                    } else {
-                        update.character = CharacterState::Roll(Data {
-                            timer: Duration::default(),
-                            stage_section: StageSection::Recover,
-                            ..*self
-                        });
-                    }
+                    // Transition to recover section of stage
+                    update.character = CharacterState::Roll(Data {
+                        timer: Duration::default(),
+                        stage_section: StageSection::Recover,
+                        ..*self
+                    });
                 }
             },
             StageSection::Recover => {
@@ -152,19 +147,3 @@ impl CharacterBehavior for Data {
         update
     }
 }
-
-fn reset_state(data: &Data, join: &JoinData, update: &mut StateUpdate) {
-    handle_input(join, update, data.static_data.ability_info.input);
-
-    if let CharacterState::Roll(r) = &mut update.character {
-        r.was_combo = data.was_combo;
-        r.was_sneak = data.was_sneak;
-        r.was_wielded = data.was_wielded;
-        if matches!(r.stage_section, StageSection::Movement) {
-            r.timer = Duration::default();
-            r.stage_section = StageSection::Recover;
-        } else {
-            r.stage_section = StageSection::Movement;
-        }
-    }
-}