From c221209743c6caa6c8302e838d4fd1ea46e85c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Tue, 20 Apr 2021 01:49:45 +0200
Subject: [PATCH] only have 1 Fn passed to tick fn

---
 client/src/lib.rs       | 10 ++++++++--
 common/state/src/lib.rs |  6 ++----
 server/src/lib.rs       |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 52f012b1df..777292495d 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -1419,8 +1419,14 @@ impl Client {
         }
 
         // 4) Tick the client's LocalState
-        self.state
-            .tick(dt, add_local_systems, add_foreign_systems, true);
+        self.state.tick(
+            dt,
+            |dispatch_builder| {
+                add_local_systems(dispatch_builder);
+                add_foreign_systems(dispatch_builder);
+            },
+            true,
+        );
         // TODO: avoid emitting these in the first place
         self.state
             .ecs()
diff --git a/common/state/src/lib.rs b/common/state/src/lib.rs
index a3707c983f..fca4e14f9e 100644
--- a/common/state/src/lib.rs
+++ b/common/state/src/lib.rs
@@ -508,8 +508,7 @@ impl State {
     pub fn tick(
         &mut self,
         dt: Duration,
-        add_local_systems: impl Fn(&mut DispatcherBuilder),
-        add_foreign_systems: impl Fn(&mut DispatcherBuilder),
+        add_systems: impl Fn(&mut DispatcherBuilder),
         update_terrain_and_regions: bool,
     ) {
         span!(_guard, "tick", "State::tick");
@@ -532,8 +531,7 @@ impl State {
         let mut dispatch_builder =
             DispatcherBuilder::new().with_pool(Arc::clone(&self.thread_pool));
         // TODO: Consider alternative ways to do this
-        add_local_systems(&mut dispatch_builder);
-        add_foreign_systems(&mut dispatch_builder);
+        add_systems(&mut dispatch_builder);
         // This dispatches all the systems in parallel.
         let mut dispatcher = dispatch_builder.build();
         drop(guard);
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 49c98eef1e..80689cce14 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -517,8 +517,8 @@ impl Server {
         // in sys/terrain.rs
         self.state.tick(
             dt,
-            add_local_systems,
             |dispatcher_builder| {
+                add_local_systems(dispatcher_builder);
                 sys::msg::add_server_systems(dispatcher_builder);
                 sys::add_server_systems(dispatcher_builder);
                 #[cfg(feature = "worldgen")]