cleanup

projectharmonia · Jan 10, 2024 · 7040211 · 7040211
1 parent a54a03b
commit 7040211
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/network_event/client_event.rs b/src/network_event/client_event.rs
@@ -139,12 +139,14 @@ impl ClientEventAppExt for App {
         self.add_event::<T>()
             .init_resource::<Events<FromClient<T>>>()
             .insert_resource(ClientEventChannel::<T>::new(channel_id))
-            .add_systems(PreUpdate, reset_system::<T>.in_set(ClientSet::ResetEvents))
             .add_systems(
                 PreUpdate,
-                receiving_system
-                    .in_set(ServerSet::Receive)
-                    .run_if(resource_exists::<RenetServer>()),
+                (
+                    reset_system::<T>.in_set(ClientSet::ResetEvents),
+                    receiving_system
+                        .in_set(ServerSet::Receive)
+                        .run_if(resource_exists::<RenetServer>()),
+                ),
             )
             .add_systems(
                 PostUpdate,

diff --git a/src/network_event/server_event.rs b/src/network_event/server_event.rs
@@ -173,14 +173,16 @@ impl ServerEventAppExt for App {
             .init_resource::<Events<ToClients<T>>>()
             .init_resource::<ServerEventQueue<T>>()
             .insert_resource(ServerEventChannel::<T>::new(channel_id))
-            .add_systems(PreUpdate, reset_system::<T>.in_set(ClientSet::ResetEvents))
             .add_systems(
                 PreUpdate,
-                (queue_system::<T>, receiving_system)
-                    .chain()
-                    .after(ClientPlugin::replication_receiving_system)
-                    .in_set(ClientSet::Receive)
-                    .run_if(client_connected()),
+                (
+                    reset_system::<T>.in_set(ClientSet::ResetEvents),
+                    (queue_system::<T>, receiving_system)
+                        .chain()
+                        .after(ClientPlugin::replication_receiving_system)
+                        .in_set(ClientSet::Receive)
+                        .run_if(client_connected()),
+                ),
             )
             .add_systems(
                 PostUpdate,