diff options
| -rwxr-xr-x | azalea-auth/src/auth.rs | 2 | ||||
| -rwxr-xr-x | azalea-block/src/lib.rs | 1 | ||||
| -rw-r--r-- | azalea-client/src/lib.rs | 1 | ||||
| -rwxr-xr-x | azalea-physics/src/collision/mergers.rs | 8 | ||||
| -rw-r--r-- | azalea/src/pathfinder/mod.rs | 9 |
5 files changed, 6 insertions, 15 deletions
diff --git a/azalea-auth/src/auth.rs b/azalea-auth/src/auth.rs index 49f0c34a..68b03306 100755 --- a/azalea-auth/src/auth.rs +++ b/azalea-auth/src/auth.rs @@ -438,7 +438,7 @@ async fn auth_with_xbox_live( Ok(ExpiringValue { data: XboxLiveAuth { token: res.token, - user_hash: res.display_claims["xui"].get(0).unwrap()["uhs"].clone(), + user_hash: res.display_claims["xui"].first().unwrap()["uhs"].clone(), }, expires_at, }) diff --git a/azalea-block/src/lib.rs b/azalea-block/src/lib.rs index f95a4f2f..b67a6e76 100755 --- a/azalea-block/src/lib.rs +++ b/azalea-block/src/lib.rs @@ -1,5 +1,4 @@ #![doc = include_str!("../README.md")] -#![feature(trait_upcasting)] mod behavior; mod generated; diff --git a/azalea-client/src/lib.rs b/azalea-client/src/lib.rs index cbbee2dc..068b3ccd 100644 --- a/azalea-client/src/lib.rs +++ b/azalea-client/src/lib.rs @@ -6,7 +6,6 @@ //! [`azalea`]: https://docs.rs/azalea #![allow(incomplete_features)] -#![feature(trait_upcasting)] #![feature(error_generic_member_access)] mod account; diff --git a/azalea-physics/src/collision/mergers.rs b/azalea-physics/src/collision/mergers.rs index 7bb472a1..ae1b45f3 100755 --- a/azalea-physics/src/collision/mergers.rs +++ b/azalea-physics/src/collision/mergers.rs @@ -135,7 +135,7 @@ impl IndexMerger { } } - pub fn new_indirect(var1: &Vec<f64>, var2: &Vec<f64>, var3: bool, var4: bool) -> Self { + pub fn new_indirect(var1: &[f64], var2: &[f64], var3: bool, var4: bool) -> Self { let mut var5 = f64::NAN; let var7 = var1.len(); let var8 = var2.len(); @@ -204,11 +204,7 @@ impl IndexMerger { pub trait IndexConsumer = FnMut(i32, i32, i32) -> bool; -fn for_non_swapped_indexes( - lower: &Vec<f64>, - upper: &Vec<f64>, - mut consumer: impl IndexConsumer, -) -> bool { +fn for_non_swapped_indexes(lower: &[f64], upper: &[f64], mut consumer: impl IndexConsumer) -> bool { let var2 = lower.len(); for var3 in 0..var2 { if !consumer(var3.try_into().unwrap(), -1, var3.try_into().unwrap()) { diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index db508004..d9a662f2 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -196,13 +196,10 @@ fn goto_listener( pathfinder.is_calculating = true; let start = if let Some(executing_path) = executing_path - && let Some(final_node) = executing_path.path.back() { + && let Some(final_node) = executing_path.path.back() + { // if we're currently pathfinding and got a goto event, start a little ahead - executing_path - .path - .get(20) - .unwrap_or(final_node) - .target + executing_path.path.get(20).unwrap_or(final_node).target } else { BlockPos::from(position) }; |