mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 06:16:04 +00:00
remove unwraps in events.rs
This commit is contained in:
parent
86fd3168f7
commit
ca48ed9e25
1 changed files with 10 additions and 24 deletions
|
@ -136,14 +136,14 @@ impl Plugin for EventPlugin {
|
|||
// when LocalPlayerEvents is added, it means the client just started
|
||||
fn init_listener(query: Query<&LocalPlayerEvents, Added<LocalPlayerEvents>>) {
|
||||
for local_player_events in &query {
|
||||
local_player_events.send(Event::Init).unwrap();
|
||||
let _ = local_player_events.send(Event::Init);
|
||||
}
|
||||
}
|
||||
|
||||
// when MinecraftEntityId is added, it means the player is now in the world
|
||||
fn login_listener(query: Query<&LocalPlayerEvents, Added<MinecraftEntityId>>) {
|
||||
for local_player_events in &query {
|
||||
local_player_events.send(Event::Login).unwrap();
|
||||
let _ = local_player_events.send(Event::Login);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -152,16 +152,14 @@ fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<ChatR
|
|||
let local_player_events = query
|
||||
.get(event.entity)
|
||||
.expect("Non-local entities shouldn't be able to receive chat events");
|
||||
local_player_events
|
||||
.send(Event::Chat(event.packet.clone()))
|
||||
.unwrap();
|
||||
let _ = local_player_events.send(Event::Chat(event.packet.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
// only tick if we're in a world
|
||||
fn tick_listener(query: Query<&LocalPlayerEvents, With<InstanceName>>) {
|
||||
for local_player_events in &query {
|
||||
local_player_events.send(Event::Tick).unwrap();
|
||||
let _ = local_player_events.send(Event::Tick);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -170,9 +168,7 @@ fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<Pac
|
|||
let local_player_events = query
|
||||
.get(event.entity)
|
||||
.expect("Non-local entities shouldn't be able to receive packet events");
|
||||
local_player_events
|
||||
.send(Event::Packet(event.packet.clone()))
|
||||
.unwrap();
|
||||
let _ = local_player_events.send(Event::Packet(event.packet.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -181,9 +177,7 @@ fn add_player_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader
|
|||
let local_player_events = query
|
||||
.get(event.entity)
|
||||
.expect("Non-local entities shouldn't be able to receive add player events");
|
||||
local_player_events
|
||||
.send(Event::AddPlayer(event.info.clone()))
|
||||
.unwrap();
|
||||
let _ = local_player_events.send(Event::AddPlayer(event.info.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -195,9 +189,7 @@ fn update_player_listener(
|
|||
let local_player_events = query
|
||||
.get(event.entity)
|
||||
.expect("Non-local entities shouldn't be able to receive update player events");
|
||||
local_player_events
|
||||
.send(Event::UpdatePlayer(event.info.clone()))
|
||||
.unwrap();
|
||||
let _ = local_player_events.send(Event::UpdatePlayer(event.info.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -209,18 +201,14 @@ fn remove_player_listener(
|
|||
let local_player_events = query
|
||||
.get(event.entity)
|
||||
.expect("Non-local entities shouldn't be able to receive remove player events");
|
||||
local_player_events
|
||||
.send(Event::RemovePlayer(event.info.clone()))
|
||||
.unwrap();
|
||||
let _ = local_player_events.send(Event::RemovePlayer(event.info.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn death_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<DeathEvent>) {
|
||||
for event in events.read() {
|
||||
if let Ok(local_player_events) = query.get(event.entity) {
|
||||
local_player_events
|
||||
.send(Event::Death(event.packet.clone().map(|p| p.into())))
|
||||
.unwrap();
|
||||
let _ = local_player_events.send(Event::Death(event.packet.clone().map(|p| p.into())));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -230,9 +218,7 @@ fn keepalive_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<
|
|||
let local_player_events = query
|
||||
.get(event.entity)
|
||||
.expect("Non-local entities shouldn't be able to receive keepalive events");
|
||||
local_player_events
|
||||
.send(Event::KeepAlive(event.id))
|
||||
.unwrap();
|
||||
let _ = local_player_events.send(Event::KeepAlive(event.id));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue