From c8485040e32de483a6c7f398a22cdedf72088c0d Mon Sep 17 00:00:00 2001
From: poffo <ltkpoffo@gmail.com>
Date: Mon, 4 Dec 2023 01:19:40 -0300
Subject: [PATCH] BevyRenet: add emit_server_events_system for
 RenetServerPlugin

We now emit server events on its own system.
Now, transports can update and disconnect clients before events are emitted.

Should fix some 1 frame disconnect/connect delays.
---
 bevy_renet/src/lib.rs       | 10 +++++++++-
 bevy_renet/src/steam.rs     |  3 ++-
 bevy_renet/src/transport.rs |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bevy_renet/src/lib.rs b/bevy_renet/src/lib.rs
index dda6b137..d76b1103 100644
--- a/bevy_renet/src/lib.rs
+++ b/bevy_renet/src/lib.rs
@@ -36,13 +36,21 @@ impl Plugin for RenetServerPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<Events<ServerEvent>>();
         app.add_systems(PreUpdate, Self::update_system.run_if(resource_exists::<RenetServer>()));
+        app.add_systems(
+            PreUpdate,
+            Self::emit_server_events_system
+                .run_if(resource_exists::<RenetServer>())
+                .after(Self::update_system),
+        );
     }
 }
 
 impl RenetServerPlugin {
-    pub fn update_system(mut server: ResMut<RenetServer>, time: Res<Time>, mut server_events: EventWriter<ServerEvent>) {
+    pub fn update_system(mut server: ResMut<RenetServer>, time: Res<Time>) {
         server.update(time.delta());
+    }
 
+    pub fn emit_server_events_system(mut server: ResMut<RenetServer>, mut server_events: EventWriter<ServerEvent>) {
         while let Some(event) = server.get_event() {
             server_events.send(event);
         }
diff --git a/bevy_renet/src/steam.rs b/bevy_renet/src/steam.rs
index f1b740c4..d9b08efa 100644
--- a/bevy_renet/src/steam.rs
+++ b/bevy_renet/src/steam.rs
@@ -26,7 +26,8 @@ impl Plugin for SteamServerPlugin {
             Self::update_system
                 .in_set(RenetReceive)
                 .run_if(resource_exists::<RenetServer>())
-                .after(RenetServerPlugin::update_system),
+                .after(RenetServerPlugin::update_system)
+                .before(RenetServerPlugin::emit_server_events_system),
         );
 
         app.add_systems(
diff --git a/bevy_renet/src/transport.rs b/bevy_renet/src/transport.rs
index 6c5b9e84..e1b451bd 100644
--- a/bevy_renet/src/transport.rs
+++ b/bevy_renet/src/transport.rs
@@ -21,7 +21,8 @@ impl Plugin for NetcodeServerPlugin {
                 .in_set(RenetReceive)
                 .run_if(resource_exists::<NetcodeServerTransport>())
                 .run_if(resource_exists::<RenetServer>())
-                .after(RenetServerPlugin::update_system),
+                .after(RenetServerPlugin::update_system)
+                .before(RenetServerPlugin::emit_server_events_system),
         );
 
         app.add_systems(