aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2023-10-12 22:43:05 -0500
committermat <git@matdoes.dev>2023-10-12 22:43:05 -0500
commit97ec9f7c7dcb02e7d7447a5fe877386528b8159e (patch)
tree3935dc3e7e2f7b447a58aab6bf73f1df35f9f146
parenteeec59adabb8c084c8b6b847a31130eb7c37d2ee (diff)
downloadazalea-drasl-97ec9f7c7dcb02e7d7447a5fe877386528b8159e.tar.xz
rename KnockbackEvent::kind to knockback
-rw-r--r--azalea-client/src/movement.rs4
-rw-r--r--azalea-client/src/packet_handling/game.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/azalea-client/src/movement.rs b/azalea-client/src/movement.rs
index f4bb8836..945f0c0c 100644
--- a/azalea-client/src/movement.rs
+++ b/azalea-client/src/movement.rs
@@ -477,7 +477,7 @@ fn has_enough_impulse_to_start_sprinting(physics_state: &PhysicsState) -> bool {
#[derive(Event)]
pub struct KnockbackEvent {
pub entity: Entity,
- pub kind: KnockbackType,
+ pub knockback: KnockbackType,
}
pub enum KnockbackType {
@@ -488,7 +488,7 @@ pub enum KnockbackType {
pub fn handle_knockback(mut query: Query<&mut Physics>, mut events: EventReader<KnockbackEvent>) {
for event in events.iter() {
if let Ok(mut physics) = query.get_mut(event.entity) {
- match event.kind {
+ match event.knockback {
KnockbackType::Set(velocity) => {
physics.velocity = velocity;
}
diff --git a/azalea-client/src/packet_handling/game.rs b/azalea-client/src/packet_handling/game.rs
index 1d8c6cc9..a81852a6 100644
--- a/azalea-client/src/packet_handling/game.rs
+++ b/azalea-client/src/packet_handling/game.rs
@@ -806,7 +806,7 @@ pub fn process_packet_events(ecs: &mut World) {
entity_mut.world_scope(|world| {
world.send_event(KnockbackEvent {
entity,
- kind: KnockbackType::Set(Vec3 {
+ knockback: KnockbackType::Set(Vec3 {
x: p.xa as f64 / 8000.,
y: p.ya as f64 / 8000.,
z: p.za as f64 / 8000.,
@@ -1199,7 +1199,7 @@ pub fn process_packet_events(ecs: &mut World) {
knockback_events.send(KnockbackEvent {
entity: player_entity,
- kind: KnockbackType::Set(Vec3 {
+ knockback: KnockbackType::Set(Vec3 {
x: p.knockback_x as f64,
y: p.knockback_y as f64,
z: p.knockback_z as f64,