aboutsummaryrefslogtreecommitdiff
path: root/azalea-client/src/local_player.rs
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2023-07-09 19:11:29 -0500
committerGitHub <noreply@github.com>2023-07-09 19:11:29 -0500
commitd1afd02aa84e7b4450c1607277f078eb2a0f1bf3 (patch)
treeefea9bb7ef7f2064f7c963fd88f394fecec6231b /azalea-client/src/local_player.rs
parentea8a8fccb6eb39c97f6cb69e11db5f7d0886172e (diff)
downloadazalea-drasl-d1afd02aa84e7b4450c1607277f078eb2a0f1bf3.tar.xz
Update to Bevy 0.11 (#94)
* update to bevy 0.11 * clippy --------- Co-authored-by: mat <git@matdoes.dev>
Diffstat (limited to 'azalea-client/src/local_player.rs')
-rw-r--r--azalea-client/src/local_player.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs
index 691f9ced..4368c47c 100644
--- a/azalea-client/src/local_player.rs
+++ b/azalea-client/src/local_player.rs
@@ -11,6 +11,7 @@ use bevy_ecs::{
component::Component,
entity::Entity,
event::EventReader,
+ prelude::Event,
query::Added,
system::{Query, Res},
};
@@ -20,7 +21,7 @@ use thiserror::Error;
use tokio::{sync::mpsc, task::JoinHandle};
use crate::{
- events::{Event, LocalPlayerEvents},
+ events::{Event as AzaleaEvent, LocalPlayerEvents},
ClientInformation, WalkDirection,
};
@@ -155,7 +156,7 @@ pub fn update_in_loaded_chunk(
/// Send the "Death" event for [`LocalPlayer`]s that died with no reason.
pub fn death_event(query: Query<&LocalPlayerEvents, Added<Dead>>) {
for local_player_events in &query {
- local_player_events.send(Event::Death(None)).unwrap();
+ local_player_events.send(AzaleaEvent::Death(None)).unwrap();
}
}
@@ -168,7 +169,7 @@ pub enum HandlePacketError {
#[error(transparent)]
Other(#[from] anyhow::Error),
#[error("{0}")]
- Send(#[from] mpsc::error::SendError<Event>),
+ Send(#[from] mpsc::error::SendError<AzaleaEvent>),
}
impl<T> From<std::sync::PoisonError<T>> for HandlePacketError {
@@ -178,6 +179,7 @@ impl<T> From<std::sync::PoisonError<T>> for HandlePacketError {
}
/// Event for sending a packet to the server.
+#[derive(Event)]
pub struct SendPacketEvent {
pub entity: Entity,
pub packet: ServerboundGamePacket,