Fix resource replication in host-server mode

lightyear/src/client/connection.rs

@@ -599,7 +599,7 @@ impl ReplicationSend for ConnectionManager {
 mod tests {
     use crate::prelude::{client, server, ClientConnectionManager};
     use crate::tests::protocol::EntityMessage;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     /// Check that we can map entities from the local world to the remote world
     /// using the ConnectionManager

lightyear/src/client/input/leafwing.rs

@@ -809,7 +809,7 @@ mod tests {
     use crate::prelude::server::Replicate;
     use crate::prelude::{client, SharedConfig, TickConfig};
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     fn build_stepper_with_input_delay(delay_ticks: u16) -> BevyStepper {
         let frame_duration = Duration::from_millis(10);

lightyear/src/client/interpolation/interpolate.rs

@@ -295,7 +295,7 @@ pub(crate) fn interpolate<C: Component + Clone>(
 //     use crate::prelude::client::*;
 //     use crate::prelude::*;
 //     use crate::tests::protocol::*;
-//     use crate::tests::stepper::{BevyStepper, Step};
+//     use crate::tests::stepper::{BevyStepper};
 //
 //     fn setup() -> (BevyStepper, Entity, Entity) {
 //         let frame_duration = Duration::from_millis(10);

lightyear/src/client/interpolation/visual_interpolation.rs

@@ -199,7 +199,7 @@ mod tests {
 
     use crate::prelude::{SharedConfig, TickConfig};
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     use super::*;
 

lightyear/src/client/message.rs

@@ -194,7 +194,7 @@ pub(crate) fn add_client_receive_message_from_server<M: Message>(app: &mut App)
 mod tests {
     use super::*;
     use crate::serialize::writer::Writer;
-    use crate::tests::host_server_stepper::{HostServerStepper, Step};
+    use crate::tests::host_server_stepper::HostServerStepper;
     use crate::tests::protocol::{Channel1, StringMessage};
     use bevy::prelude::{EventReader, Resource, Update};
 

lightyear/src/client/networking.rs

@@ -542,7 +542,7 @@ mod tests {
     use crate::{
         client::config::ClientConfig,
         prelude::{client::ClientCommands, server::*, SharedConfig, TickConfig},
-        tests::host_server_stepper::{HostServerStepper, Step},
+        tests::host_server_stepper::HostServerStepper,
     };
 
     #[derive(Resource, Default)]

lightyear/src/client/prediction/despawn.rs

@@ -202,7 +202,7 @@ pub(crate) fn remove_despawn_marker(
 //     use crate::prelude::client::*;
 //     use crate::prelude::*;
 //     use crate::tests::protocol::*;
-//     use crate::tests::stepper::{BevyStepper, Step};
+//     use crate::tests::stepper::{BevyStepper};
 //     use bevy::prelude::*;
 //     use bevy::utils::Duration;
 //

lightyear/src/client/prediction/pre_prediction.rs

@@ -193,7 +193,7 @@ mod tests {
     use crate::tests::protocol::{
         ComponentSyncModeFull, ComponentSyncModeOnce, ComponentSyncModeSimple,
     };
-    use crate::tests::stepper::{BevyStepper, Step, TEST_CLIENT_ID};
+    use crate::tests::stepper::{BevyStepper, TEST_CLIENT_ID};
 
     /// Simple preprediction case
     #[test]

lightyear/src/client/prediction/predicted_history.rs

@@ -338,7 +338,7 @@ mod tests {
     use super::*;
     use crate::prelude::client::RollbackState;
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
     use crate::utils::ready_buffer::ItemWithReadyKey;
     use bevy::ecs::system::RunSystemOnce;
 

lightyear/src/client/prediction/prespawn.rs

@@ -452,7 +452,7 @@ mod tests {
 
     use crate::prelude::*;
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
     use crate::utils::ready_buffer::ItemWithReadyKey;
 
     #[test]

lightyear/src/client/prediction/rollback.rs

@@ -598,7 +598,7 @@ mod unit_tests {
     use super::*;
 
     use crate::tests::protocol::ComponentSyncModeFull;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
     use bevy::ecs::system::RunSystemOnce;
 
     // TODO: check that if A is updated but B is not, and A and B are in the same replication group,
@@ -757,7 +757,7 @@ mod integration_tests {
 
     use crate::prelude::client::*;
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
     use bevy::prelude::*;
 
     fn increment_component(

lightyear/src/client/replication.rs

@@ -537,7 +537,7 @@ pub(crate) mod send {
             server, ClientId, DisabledComponent, ReplicateOnceComponent, Replicated, TargetEntity,
         };
         use crate::tests::protocol::ComponentSyncModeFull;
-        use crate::tests::stepper::{BevyStepper, Step, TEST_CLIENT_ID};
+        use crate::tests::stepper::{BevyStepper, TEST_CLIENT_ID};
 
         #[test]
         fn test_entity_spawn() {

lightyear/src/client/sync.rs

@@ -566,7 +566,7 @@ mod tests {
     use crate::prelude::*;
     use crate::server::events::InputEvent;
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     use super::*;
 

lightyear/src/server/clients.rs

@@ -161,7 +161,7 @@ mod tests {
     use crate::server::clients::ControlledEntities;
     use crate::server::replication::send::Lifetime;
     use crate::tests::multi_stepper::{MultiBevyStepper, TEST_CLIENT_ID_1, TEST_CLIENT_ID_2};
-    use crate::tests::stepper::{BevyStepper, Step, TEST_CLIENT_ID};
+    use crate::tests::stepper::{BevyStepper, TEST_CLIENT_ID};
     use bevy::ecs::entity::EntityHashMap;
     use bevy::prelude::{default, Entity, With};
 

lightyear/src/server/connection.rs

@@ -307,6 +307,7 @@ impl ConnectionManager {
         channel: ChannelKind,
         target: NetworkTarget,
     ) -> Result<(), ServerError> {
+        dbg!(&target);
         self.connections
             .iter_mut()
             .filter(|(id, _)| target.targets(id))
@@ -316,6 +317,7 @@ impl ConnectionManager {
                 if c.is_local_client() {
                     c.local_messages_to_send.push(message.clone())
                 } else {
+                    dbg!("sending resource message2");
                     // NOTE: this clone is O(1), it just increments the reference count
                     c.buffer_message(message.clone(), channel)?;
                 }

lightyear/src/server/input/leafwing.rs

@@ -237,7 +237,7 @@ mod tests {
     use crate::prelude::client;
     use crate::prelude::server::*;
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     #[test]
     fn test_leafwing_inputs() {

lightyear/src/server/message.rs

@@ -181,7 +181,7 @@ pub(crate) fn add_server_receive_message_from_client<M: Message>(app: &mut App)
 #[cfg(test)]
 mod tests {
     use crate::prelude::NetworkTarget;
-    use crate::tests::host_server_stepper::{HostServerStepper, Step};
+    use crate::tests::host_server_stepper::HostServerStepper;
     use crate::tests::protocol::{Channel1, StringMessage};
     use bevy::app::Update;
     use bevy::prelude::{EventReader, ResMut, Resource};

lightyear/src/server/relevance/room.rs

@@ -495,7 +495,7 @@ mod tests {
     };
     use crate::server::relevance::immediate::{CachedNetworkRelevance, ClientRelevance};
     use crate::shared::replication::components::NetworkRelevanceMode;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     use super::systems::buffer_room_relevance_events;
 

lightyear/src/server/replication.rs

@@ -986,7 +986,7 @@ pub(crate) mod send {
         use crate::shared::replication::systems;
         use crate::tests::multi_stepper::{MultiBevyStepper, TEST_CLIENT_ID_1, TEST_CLIENT_ID_2};
         use crate::tests::protocol::*;
-        use crate::tests::stepper::{BevyStepper, Step, TEST_CLIENT_ID};
+        use crate::tests::stepper::{BevyStepper, TEST_CLIENT_ID};
         use bevy::ecs::system::RunSystemOnce;
         use bevy::prelude::{default, EventReader, Resource, Update};
         use bevy::utils::HashSet;
@@ -3040,7 +3040,7 @@ pub(crate) mod commands {
 
         use crate::prelude::server::Replicate;
         use crate::tests::protocol::*;
-        use crate::tests::stepper::{BevyStepper, Step};
+        use crate::tests::stepper::BevyStepper;
 
         use super::*;
 

lightyear/src/shared/replication/entity_map.rs

@@ -123,7 +123,7 @@ mod tests {
     use crate::prelude::server::Replicate;
     use crate::prelude::*;
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     // An entity gets replicated from server to client,
     // then a component gets removed from that entity on server,

lightyear/src/shared/replication/hierarchy.rs

@@ -250,7 +250,7 @@ mod tests {
     use crate::shared::replication::components::ReplicateHierarchy;
     use crate::shared::replication::hierarchy::ParentSync;
     use crate::tests::protocol::*;
-    use crate::tests::stepper::{BevyStepper, Step};
+    use crate::tests::stepper::BevyStepper;
 
     fn setup_hierarchy() -> (BevyStepper, Entity, Entity, Entity) {
         let mut stepper = BevyStepper::default();