forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix final few errors

Browse Source
This commit is contained in:
Elliott Pierce 2025-05-30 22:32:39 -04:00
parent f4e06add26
commit 3df6ab012b
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/bevy_ecs/src/world/command_queue.rs
View File

@ -83,9 +83,6 @@ impl CommandQueue {
/// This clears the queue. /// This clears the queue.
#[inline] #[inline]
pub fn apply(&mut self, world: &mut World) { pub fn apply(&mut self, world: &mut World) {
// flush the previously queued entities
world.flush_entities();
// flush the world's internal queue // flush the world's internal queue
world.flush_commands(); world.flush_commands();

7
crates/bevy_ecs/src/world/deferred_world.rs
View File

@ -23,7 +23,7 @@ use super::{unsafe_world_cell::UnsafeWorldCell, Mut, World, ON_INSERT, ON_REPLAC
/// ///
/// This means that in order to add entities, for example, you will need to use commands instead of the world directly. /// This means that in order to add entities, for example, you will need to use commands instead of the world directly.
pub struct DeferredWorld<'w> { pub struct DeferredWorld<'w> {
// SAFETY: Implementors must not use this reference to make structural changes // SAFETY: Implementers must not use this reference to make structural changes
world: UnsafeWorldCell<'w>, world: UnsafeWorldCell<'w>,
} }
@ -69,7 +69,7 @@ impl<'w> DeferredWorld<'w> {
// SAFETY: &mut self ensure that there are no outstanding accesses to the queue // SAFETY: &mut self ensure that there are no outstanding accesses to the queue
let command_queue = unsafe { self.world.get_raw_command_queue() }; let command_queue = unsafe { self.world.get_raw_command_queue() };
// SAFETY: command_queue is stored on world and always valid while the world exists // SAFETY: command_queue is stored on world and always valid while the world exists
unsafe { Commands::new_raw_from_entities(command_queue, self.world.entities()) } unsafe { Commands::new_raw_from_entities(command_queue, self.world.entities_allocator()) }
} }
/// Retrieves a mutable reference to the given `entity`'s [`Component`] of the given type. /// Retrieves a mutable reference to the given `entity`'s [`Component`] of the given type.
@ -415,7 +415,8 @@ impl<'w> DeferredWorld<'w> {
// - Command queue access does not conflict with entity access. // - Command queue access does not conflict with entity access.
let raw_queue = unsafe { cell.get_raw_command_queue() }; let raw_queue = unsafe { cell.get_raw_command_queue() };
// SAFETY: `&mut self` ensures the commands does not outlive the world. // SAFETY: `&mut self` ensures the commands does not outlive the world.
let commands = unsafe { Commands::new_raw_from_entities(raw_queue, cell.entities()) }; let commands =
unsafe { Commands::new_raw_from_entities(raw_queue, cell.entities_allocator()) };
(fetcher, commands) (fetcher, commands)
} }

1
crates/bevy_ecs/src/world/spawn_batch.rs
View File

@ -36,7 +36,6 @@ where
let (lower, upper) = iter.size_hint(); let (lower, upper) = iter.size_hint();
let length = upper.unwrap_or(lower); let length = upper.unwrap_or(lower);
world.entities.reserve(length as u32);
let mut spawner = BundleSpawner::new::<I::Item>(world, change_tick); let mut spawner = BundleSpawner::new::<I::Item>(world, change_tick);
spawner.reserve_storage(length); spawner.reserve_storage(length);