diff --git a/crates/bevy_ecs/src/event/collections.rs b/crates/bevy_ecs/src/event/collections.rs index 4c9bc1996f8da..c04512ba62bba 100644 --- a/crates/bevy_ecs/src/event/collections.rs +++ b/crates/bevy_ecs/src/event/collections.rs @@ -114,9 +114,7 @@ impl Default for Events { impl Events { /// Returns the index of the oldest event stored in the event buffer. pub fn oldest_event_count(&self) -> usize { - self.events_a - .start_event_count - .min(self.events_b.start_event_count) + self.events_a.start_event_count } /// "Sends" an `event` by writing it to the current event buffer. @@ -279,7 +277,7 @@ impl Events { /// Get a specific event by id if it still exists in the events buffer. pub fn get_event(&self, id: usize) -> Option<(&E, EventId)> { - if id < self.oldest_id() { + if id < self.oldest_event_count() { return None; } @@ -291,11 +289,6 @@ impl Events { .map(|instance| (&instance.event, instance.event_id)) } - /// Oldest id still in the events buffer. - pub fn oldest_id(&self) -> usize { - self.events_a.start_event_count - } - /// Which event buffer is this event id a part of. fn sequence(&self, id: usize) -> &EventSequence { if id < self.events_b.start_event_count {