From d1b34fb63dbc28659cdbd883cebad058c70ee080 Mon Sep 17 00:00:00 2001
From: Martin Indra <martin.indra@mgn.cz>
Date: Tue, 20 Feb 2024 11:30:05 +0100
Subject: [PATCH] various fixes

---
 crates/audio/src/spatial.rs      | 2 +-
 crates/combat/src/trail.rs       | 2 +-
 crates/movement/src/repulsion.rs | 2 +-
 crates/movement/src/syncing.rs   | 2 +-
 crates/signs/src/line.rs         | 6 +++---
 crates/spawner/src/draft.rs      | 4 +++-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index 88a43477..f27f1e38 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -146,7 +146,7 @@ fn play(
     let camera = camera.single();
     let sound_volume = config.audio().sound_volume() as f64;
 
-    for PlaySpatialAudioEvent { sound, position } in &mut play_events {
+    for PlaySpatialAudioEvent { sound, position } in play_events.read() {
         let (volume, pan) = calculate_volume_and_pan(camera, &focus, *position);
         let handle = audio
             .play(sounds.0[*sound].clone())
diff --git a/crates/combat/src/trail.rs b/crates/combat/src/trail.rs
index 5b773bab..224a8bff 100644
--- a/crates/combat/src/trail.rs
+++ b/crates/combat/src/trail.rs
@@ -87,7 +87,7 @@ impl Trail {
     }
 }
 
-#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
+#[derive(Asset, AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 #[uuid = "560ab431-1a54-48b3-87ea-8de8d94ceafb"]
 struct TrailMaterial {
     #[uniform(0)]
diff --git a/crates/movement/src/repulsion.rs b/crates/movement/src/repulsion.rs
index fe3ecdf5..6ce6a56a 100644
--- a/crates/movement/src/repulsion.rs
+++ b/crates/movement/src/repulsion.rs
@@ -142,7 +142,7 @@ fn setup_entities(
     mut commands: Commands,
     objects: Query<Entity, (With<MovableSolid>, Without<Repulsion>)>,
 ) {
-    for entity in objects.read() {
+    for entity in objects.iter() {
         commands.entity(entity).insert(Repulsion::default());
     }
 }
diff --git a/crates/movement/src/syncing.rs b/crates/movement/src/syncing.rs
index 31ea74e0..1e6fe5ea 100644
--- a/crates/movement/src/syncing.rs
+++ b/crates/movement/src/syncing.rs
@@ -69,7 +69,7 @@ type NotSetUp = (With<MovableSolid>, With<Local>, Without<SyncTimer>);
 
 fn setup_entities(mut commands: Commands, time: Res<Time>, entities: Query<Entity, NotSetUp>) {
     let time = time.elapsed();
-    for entity in entities.read() {
+    for entity in entities.iter() {
         commands.entity(entity).insert(SyncTimer::new(time));
     }
 }
diff --git a/crates/signs/src/line.rs b/crates/signs/src/line.rs
index 157db03b..8d3fec9a 100644
--- a/crates/signs/src/line.rs
+++ b/crates/signs/src/line.rs
@@ -160,7 +160,7 @@ fn update_line_end(
     lines: Res<LineLocations>,
     mut line_location: EventWriter<UpdateLineLocationEvent>,
 ) {
-    for event in &mut events {
+    for event in events.read() {
         if let Some(old_location) = lines.0.get(&event.owner) {
             let location = LineLocation::new(old_location.start, event.end);
             line_location.send(UpdateLineLocationEvent::new(event.owner, location));
@@ -174,7 +174,7 @@ fn update_line_location(
     mut transforms: Query<&mut Transform>,
     mut line_locations: ResMut<LineLocations>,
 ) {
-    for event in &mut events {
+    for event in events.read() {
         line_locations.0.insert(event.owner, event.location);
         if let Some(line_entity) = lines.0.get(&event.owner) {
             let mut current_transform = transforms.get_mut(*line_entity).unwrap();
@@ -190,7 +190,7 @@ fn update_line_visibility(
     mut commands: Commands,
     line_mesh: Res<LineMesh>,
 ) {
-    for event in &mut events {
+    for event in events.read() {
         if event.visible && !lines.0.contains_key(&event.owner) {
             let transform = line_locations
                 .0
diff --git a/crates/spawner/src/draft.rs b/crates/spawner/src/draft.rs
index 87644822..43d6c666 100644
--- a/crates/spawner/src/draft.rs
+++ b/crates/spawner/src/draft.rs
@@ -64,7 +64,9 @@ impl DraftBundle {
             object_type: ObjectType::Active(ActiveObjectType::Building(building_type)).into(),
             transform,
             global_transform: transform.into(),
-            ..default()
+            visibility: VisibilityBundle::default(),
+            draft: DraftAllowed::default(),
+            ready: DraftReady::default(),
         }
     }
 }