From 61f825cd5656fc44a31e7c20286f21452c5b611c Mon Sep 17 00:00:00 2001
From: James O'Brien <james.obrien@drafly.net>
Date: Sun, 15 Sep 2024 10:43:09 -0700
Subject: [PATCH] Fix system ordering

---
 crates/hyperion/src/egress/player_join/mod.rs | 2 +-
 crates/hyperion/src/ingress/mod.rs            | 2 +-
 crates/hyperion/src/simulation/handlers.rs    | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/hyperion/src/egress/player_join/mod.rs b/crates/hyperion/src/egress/player_join/mod.rs
index 31dab35d..40d54b13 100644
--- a/crates/hyperion/src/egress/player_join/mod.rs
+++ b/crates/hyperion/src/egress/player_join/mod.rs
@@ -528,7 +528,7 @@ impl Module for PlayerJoinModule {
             &MinecraftWorld($),
             &Compose($),
         )
-        .kind::<flecs::pipeline::OnStore>()
+        .kind::<flecs::pipeline::PreUpdate>()
         .each(move |(tasks, comms, blocks, compose)| {
             let span = tracing::trace_span!("joins");
             let _enter = span.enter();
diff --git a/crates/hyperion/src/ingress/mod.rs b/crates/hyperion/src/ingress/mod.rs
index 94f84b3b..31fda345 100644
--- a/crates/hyperion/src/ingress/mod.rs
+++ b/crates/hyperion/src/ingress/mod.rs
@@ -428,7 +428,7 @@ impl Module for IngressModule {
             &mut Metadata,
             &mut ActiveAnimation,
         )
-        .kind::<flecs::pipeline::PreStore>()
+        .kind::<flecs::pipeline::OnUpdate>()
         .write::<PendingChanges>()
         .multi_threaded()
         .tracing_each_entity(
diff --git a/crates/hyperion/src/simulation/handlers.rs b/crates/hyperion/src/simulation/handlers.rs
index ab6b9b25..d788293a 100644
--- a/crates/hyperion/src/simulation/handlers.rs
+++ b/crates/hyperion/src/simulation/handlers.rs
@@ -147,8 +147,6 @@ fn position_and_on_ground(
 ) -> anyhow::Result<()> {
     let pkt = play::PositionAndOnGroundC2s::decode(&mut data)?;
 
-    // debug!("position and on ground packet: {:?}", pkt);
-
     let play::PositionAndOnGroundC2s { position, .. } = pkt;
 
     change_position_or_correct_client(query, position.as_vec3());