diff --git a/crates/horizon-client/src/block_transform.rs b/crates/horizon-client/src/block_transform.rs index 92f1455e9..4cd1d6f94 100644 --- a/crates/horizon-client/src/block_transform.rs +++ b/crates/horizon-client/src/block_transform.rs @@ -142,7 +142,7 @@ impl Predicate { match self { Self::Blocks(names) => { let state = around.state([0, 0, 0]); - names.iter().any(|n| *n == state.name) + names.contains(&state.name) } Self::Tag { tag, offset } => { let state = around.state(*offset); diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 2852e9633..5725c9fe8 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5746,7 +5746,7 @@ impl Game<'_> { } return Ok(true); } - if self.use_block_transformer(&stack, hit.pos, hit.face)? { + if self.use_block_transformer(stack, hit.pos, hit.face)? { return Ok(true); } if item == "honeycomb" { diff --git a/crates/horizon-client/src/menu.rs b/crates/horizon-client/src/menu.rs index 071d13be4..4d7cec897 100644 --- a/crates/horizon-client/src/menu.rs +++ b/crates/horizon-client/src/menu.rs @@ -878,9 +878,9 @@ impl Menu { if input == Input::QuickCraft { let expected = self.quick_status; self.quick_status = button & 3; - if (expected != 1 || self.quick_status != 2) && expected != self.quick_status { - self.reset_quick_craft(); - } else if self.carried.is_none() { + if ((expected != 1 || self.quick_status != 2) && expected != self.quick_status) + || self.carried.is_none() + { self.reset_quick_craft(); } else if self.quick_status == 0 { self.quick_type = (button >> 2) & 3; @@ -1069,7 +1069,7 @@ impl Menu { let amount = if primary { clicked.count } else { - (clicked.count + 1) / 2 + clicked.count.div_ceil(2) }; if let Some(taken) = self.try_remove(env, s, amount, u32::MAX) { self.carried = Some(taken); @@ -1190,10 +1190,10 @@ impl Menu { let item = self.slot(t).expect("has item").clone(); if pass != 0 || item.count != Self::max_stack(env, &item) { let room = carried_max - have.count; - if let Some(removed) = self.safe_take(env, t, item.count, room) { - if let Some(c) = self.carried.as_mut() { - c.count += removed.count; - } + if let Some(removed) = self.safe_take(env, t, item.count, room) + && let Some(c) = self.carried.as_mut() + { + c.count += removed.count; } } }