From 5ff273379df334788870d2a8df546c31509f4d21 Mon Sep 17 00:00:00 2001 From: Ben Frankel Date: Mon, 13 May 2024 23:04:46 -0700 Subject: [PATCH] Revert an unnecessary refactor --- crates/bevy_state/src/state/state_set.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/crates/bevy_state/src/state/state_set.rs b/crates/bevy_state/src/state/state_set.rs index b09a9f2c02163..2ce00860f5768 100644 --- a/crates/bevy_state/src/state/state_set.rs +++ b/crates/bevy_state/src/state/state_set.rs @@ -106,7 +106,12 @@ impl StateSet for S { } parent_changed.clear(); - let new_state = S::convert_to_usable_state(state_set.as_deref()).and_then(T::compute); + let new_state = + if let Some(state_set) = S::convert_to_usable_state(state_set.as_deref()) { + T::compute(state_set) + } else { + None + }; let same_state = current_state.as_ref().map(|x| x.get()) == new_state.as_ref(); if same_state && !should_refresh { @@ -153,7 +158,12 @@ impl StateSet for S { } parent_changed.clear(); - let new_state = S::convert_to_usable_state(state_set.as_deref()).and_then(T::should_exist); + let new_state = + if let Some(state_set) = S::convert_to_usable_state(state_set.as_deref()) { + T::should_exist(state_set) + } else { + None + }; if current_state.is_none() || new_state.is_none() { internal_apply_state_transition(event, commands, current_state, new_state);