fix: knockback

Snowiiii · Oct 20, 2024 · 8ede38d · 8ede38d
1 parent b7ac8ad
commit 8ede38d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pumpkin/src/client/player_packet.rs b/pumpkin/src/client/player_packet.rs
@@ -422,21 +422,21 @@ impl Player {
                             if config.knockback {
                                 let yaw = entity.yaw.load();
                                 let strength = 1.0;
-                                let victem_velocity = victem_entity.velocity.load();
-                                let saved_velo = victem_velocity;
+                                let saved_velo = victem_entity.velocity.load();
                                 victem_entity.knockback(
                                     strength * 0.5,
                                     (yaw * (PI / 180.0)).sin() as f64,
                                     -(yaw * (PI / 180.0)).cos() as f64,
                                 );
+                                let victem_velocity = victem_entity.velocity.load();
                                 let packet = &CEntityVelocity::new(
                                     &entity_id,
                                     victem_velocity.x as f32,
                                     victem_velocity.y as f32,
                                     victem_velocity.z as f32,
                                 );
                                 let velocity = entity.velocity.load();
-                                victem_entity
+                                entity
                                     .velocity
                                     .store(velocity.multiply(0.6, 1.0, 0.6));
 

diff --git a/pumpkin/src/world/player_chunker.rs b/pumpkin/src/world/player_chunker.rs
@@ -112,9 +112,6 @@ pub async fn update_position(player: &Player) {
             },
             |chunk_pos| {
                 unloading_chunks.push(chunk_pos);
-                // player
-                //     .client
-                //     .send_packet(&CUnloadChunk::new(chunk_pos.x, chunk_pos.z));
             },
             false,
         );
@@ -131,6 +128,7 @@ pub async fn update_position(player: &Player) {
                 .world
                 .mark_chunks_as_not_watched(&unloading_chunks)
                 .await;
+            // we may don't need to iter twice
             for chunk in unloading_chunks {
                 if !player
                     .client