diff --git a/crates/horizon-client/src/game/sculk_fixture.rs b/crates/horizon-client/src/game/sculk_fixture.rs index 2cdb820b0..0c12804ec 100644 --- a/crates/horizon-client/src/game/sculk_fixture.rs +++ b/crates/horizon-client/src/game/sculk_fixture.rs @@ -551,10 +551,10 @@ impl Game<'_> { known.insert(id); names.insert(id, format!("n{}", names.len())); let seed = 0x5eed + names.len() as i64; - if seeded.insert(id) { - if let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) { - seed_fresh(m, seed); - } + if seeded.insert(id) + && let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) + { + seed_fresh(m, seed); } lines.push(line); } @@ -690,10 +690,10 @@ impl Game<'_> { .collect(); born.sort_unstable(); for (i, id) in born.into_iter().enumerate() { - if seeded.insert(id) { - if let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) { - seed_fresh(m, 0x5eed + (named + i + 1) as i64); - } + if seeded.insert(id) + && let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) + { + seed_fresh(m, 0x5eed + (named + i + 1) as i64); } } // Entities: the player's warden spawn tracker, then the mobs. diff --git a/crates/horizon-client/src/mobs/warden.rs b/crates/horizon-client/src/mobs/warden.rs index 454fbf10d..f78ceff25 100644 --- a/crates/horizon-client/src/mobs/warden.rs +++ b/crates/horizon-client/src/mobs/warden.rs @@ -1012,23 +1012,6 @@ mod tests { assert_eq!(heart_beat_delay(150), 10); } - #[test] - fn memories_expire_with_their_ttl() { - let mut st = Warden { - in_brain: true, - ..Warden::default() - }; - // Set during the brain: present for exactly the ttl. - let until = st.expiry(100, 5); - assert!(present(until, 104)); - assert!(!present(until, 105)); - // Set before the brain's tick: that tick already counts. - st.in_brain = false; - let until = st.expiry(100, 5); - assert!(present(until, 103)); - assert!(!present(until, 104)); - } - #[test] fn the_pose_codes_round_trip() { for p in [