Fix tests

Author: Shatur

src/network_event/server_event.rs

@@ -189,7 +189,7 @@ impl ServerEventAppExt for App {
                         local_resending_system::<T>.run_if(has_authority()),
                     )
                         .chain()
-                        .before(ServerPlugin::replication_sending_system)
+                        .after(ServerPlugin::replication_sending_system)
                         .in_set(ServerSet::Send),
                     reset_system::<T>.run_if(resource_removed::<RenetClient>()),
                 ),

src/replicon_core/replicon_tick.rs

@@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
 /// A tick that increments each time we need the server to compute and send an update.
 ///
 /// Updated on clients every time they receive replication from the server.
-/// Mapped to the Bevy's `Tick` in [`AckedTicks`](crate::server::AckedTicks).
 /// See also [`TickPolicy`](crate::server::TickPolicy).
 #[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Hash, PartialEq, Resource, Serialize)]
 pub struct RepliconTick(pub(crate) u32);

src/server.rs

@@ -56,12 +56,7 @@ impl Plugin for ServerPlugin {
         .init_resource::<LastChangeTick>()
         .init_resource::<ClientEntityMap>()
         .configure_sets(PreUpdate, ServerSet::Receive.after(RenetReceive))
-        .configure_sets(
-            PostUpdate,
-            ServerSet::Send
-                .before(RenetSend)
-                .run_if(resource_changed::<RepliconTick>()),
-        )
+        .configure_sets(PostUpdate, ServerSet::Send.before(RenetSend))
         .add_systems(
             PreUpdate,
             (Self::acks_receiving_system, Self::disconnect_cleanup_system)
@@ -74,7 +69,8 @@ impl Plugin for ServerPlugin {
                 Self::replication_sending_system
                     .map(Result::unwrap)
                     .in_set(ServerSet::Send)
-                    .run_if(resource_exists::<RenetServer>()),
+                    .run_if(resource_exists::<RenetServer>())
+                    .run_if(resource_changed::<RepliconTick>()),
                 Self::reset_system.run_if(resource_removed::<RenetServer>()),
             ),
         );
@@ -86,6 +82,7 @@ impl Plugin for ServerPlugin {
                     PostUpdate,
                     Self::increment_tick
                         .before(Self::replication_sending_system)
+                        .run_if(resource_exists::<RenetServer>())
                         .run_if(on_timer(tick_time)),
                 );
             }

tests/server_event.rs

@@ -173,32 +173,14 @@ fn event_queue() {
         .resource_mut::<ServerEventQueue<DummyEvent>>()
         .insert(tick, DummyEvent(Entity::PLACEHOLDER));
 
-    // Send another event to trigger world update.
-    server_app
-        .world
-        .resource_mut::<Events<ToClients<DummyEvent>>>()
-        .send(ToClients {
-            mode: SendMode::Broadcast,
-            event: DummyEvent(Entity::PLACEHOLDER),
-        });
-
-    server_app.update();
     client_app.update();
 
-    let mut dummy_events = client_app.world.resource_mut::<Events<DummyEvent>>();
-    assert_eq!(
-        dummy_events.drain().count(),
-        1,
-        "should emit only single event for current tick"
-    );
+    assert!(client_app.world.resource::<Events<DummyEvent>>().is_empty());
+
+    client_app.insert_resource(tick);
 
-    server_app.update();
     client_app.update();
 
     let dummy_events = client_app.world.resource::<Events<DummyEvent>>();
-    assert_eq!(
-        dummy_events.len(),
-        1,
-        "should emit another event received earlier"
-    );
+    assert_eq!(dummy_events.len(), 1);
 }