fix all bevy ambiguities

1 files changed, 6 insertions, 4 deletions

diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs
index 3c9428ff..2f7480cb 100644
--- a/azalea-client/src/interact.rs
+++ b/azalea-client/src/interact.rs
@@ -28,7 +28,7 @@ use log::warn;
 
 use crate::{
     client::{PermissionLevel, PlayerAbilities},
-    inventory::InventoryComponent,
+    inventory::{InventoryComponent, InventorySet},
     local_player::{handle_send_packet_event, LocalGameMode, SendPacketEvent},
     Client, LocalPlayer,
 };
@@ -49,7 +49,9 @@ impl Plugin for InteractPlugin {
                     )
                         .before(handle_send_packet_event)
                         .chain(),
-                    update_modifiers_for_held_item,
+                    update_modifiers_for_held_item
+                        .after(InventorySet)
+                        .after(crate::movement::walk_listener),
                 ),
             );
     }
@@ -151,7 +153,7 @@ pub fn handle_block_interact_event(
 }
 
 #[allow(clippy::type_complexity)]
-fn update_hit_result_component(
+pub fn update_hit_result_component(
     mut commands: Commands,
     mut query: Query<(
         Entity,
@@ -297,7 +299,7 @@ pub fn can_use_game_master_blocks(
 pub struct SwingArmEvent {
     pub entity: Entity,
 }
-fn handle_swing_arm_event(
+pub fn handle_swing_arm_event(
     mut events: EventReader<SwingArmEvent>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {