From 75efbc83fdc4a47f880e95259a339d41839af01a Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 19 Mar 2025 21:35:47 +0000 Subject: make SendPacketEvent a bevy trigger --- azalea-client/src/plugins/interact.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'azalea-client/src/plugins/interact.rs') diff --git a/azalea-client/src/plugins/interact.rs b/azalea-client/src/plugins/interact.rs index 1a344cc8..a0dfa12a 100644 --- a/azalea-client/src/plugins/interact.rs +++ b/azalea-client/src/plugins/interact.rs @@ -22,7 +22,7 @@ use bevy_app::{App, Plugin, Update}; use bevy_ecs::{ component::Component, entity::Entity, - event::{Event, EventReader, EventWriter}, + event::{Event, EventReader}, query::{Changed, With}, schedule::IntoSystemConfigs, system::{Commands, Query, Res}, @@ -112,7 +112,7 @@ pub struct HitResultComponent(BlockHitResult); pub fn handle_block_interact_event( mut events: EventReader, mut query: Query<(Entity, &mut CurrentSequenceNumber, &HitResultComponent)>, - mut send_packet_events: EventWriter, + mut commands: Commands, ) { for event in events.read() { let Ok((entity, mut sequence_number, hit_result)) = query.get_mut(event.entity) else { @@ -150,7 +150,7 @@ pub fn handle_block_interact_event( } }; - send_packet_events.send(SendPacketEvent::new( + commands.trigger(SendPacketEvent::new( entity, ServerboundUseItemOn { hand: InteractionHand::MainHand, @@ -299,12 +299,9 @@ pub fn can_use_game_master_blocks( pub struct SwingArmEvent { pub entity: Entity, } -pub fn handle_swing_arm_event( - mut events: EventReader, - mut send_packet_events: EventWriter, -) { +pub fn handle_swing_arm_event(mut events: EventReader, mut commands: Commands) { for event in events.read() { - send_packet_events.send(SendPacketEvent::new( + commands.trigger(SendPacketEvent::new( event.entity, ServerboundSwing { hand: InteractionHand::MainHand, -- cgit v1.2.3