diff options
| author | mat <git@matdoes.dev> | 2023-10-03 01:36:07 -0500 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2023-10-03 01:36:07 -0500 |
| commit | 86d96071b3d3e0c461ad54d1f0029e8942789440 (patch) | |
| tree | 58ddd35bb308ce8ccf66186b055d4a46b5736090 | |
| parent | e9c5231336b95c0d2e93c96279b8cac036b45527 (diff) | |
| download | azalea-drasl-86d96071b3d3e0c461ad54d1f0029e8942789440.tar.xz | |
upgrade deps and make test not flaky
the test just always fails now, this needs to be fixed but at least it's easier to fix now
| -rw-r--r-- | azalea/Cargo.toml | 12 | ||||
| -rw-r--r-- | azalea/src/pathfinder/mod.rs | 6 | ||||
| -rw-r--r-- | azalea/src/pathfinder/simulation.rs | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index 61a0cc93..cecd316b 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -25,9 +25,9 @@ azalea-registry = { version = "0.8.0", path = "../azalea-registry" } azalea-world = { version = "0.8.0", path = "../azalea-world" } azalea-auth = { version = "0.8.0", path = "../azalea-auth" } azalea-brigadier = { version = "0.8.0", path = "../azalea-brigadier" } -bevy_app = "0.11.2" -bevy_ecs = "0.11.2" -bevy_tasks = "0.11.2" +bevy_app = "0.11.3" +bevy_ecs = "0.11.3" +bevy_tasks = "0.11.3" derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] } futures = "0.3.28" futures-lite = "1.13.0" @@ -36,12 +36,12 @@ nohash-hasher = "0.2.0" num-traits = "0.2.16" parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] } priority-queue = "1.3.2" -thiserror = "^1.0.48" +thiserror = "^1.0.49" tokio = "^1.32.0" uuid = "1.4.1" -bevy_log = "0.11.2" +bevy_log = "0.11.3" azalea-entity = { version = "0.8.0", path = "../azalea-entity" } -bevy_time = "0.11.2" +bevy_time = "0.11.3" [dev-dependencies] criterion = "0.5.1" diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index 03d161fc..99bc7787 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -586,6 +586,8 @@ mod tests { start_pos.z as f64 + 0.5, )); let mut simulation = Simulation::new(chunks, player); + + // you can uncomment this while debugging tests to get trace logs // simulation.app.add_plugins(bevy_log::LogPlugin { // level: bevy_log::Level::TRACE, // filter: "".to_string(), @@ -693,7 +695,7 @@ mod tests { let mut simulation = setup_simulation( &mut partial_chunks, BlockPos::new(0, 71, 0), - BlockPos::new(3, 68, 3), + BlockPos::new(3, 67, 4), vec![ BlockPos::new(0, 70, 0), BlockPos::new(0, 69, 1), @@ -703,7 +705,7 @@ mod tests { BlockPos::new(3, 66, 4), ], ); - for _ in 0..140 { + for _ in 0..100 { simulation.tick(); } assert_eq!( diff --git a/azalea/src/pathfinder/simulation.rs b/azalea/src/pathfinder/simulation.rs index 565e3e92..2b1bfd42 100644 --- a/azalea/src/pathfinder/simulation.rs +++ b/azalea/src/pathfinder/simulation.rs @@ -68,7 +68,7 @@ impl Simulation { azalea_client::task_pool::TaskPoolPlugin::default(), )) // make sure it doesn't do fixed ticks without us telling it to - .insert_resource(FixedTime::new(Duration::from_secs(60))) + .insert_resource(FixedTime::new(Duration::MAX)) .insert_resource(InstanceContainer { instances: [(instance_name.clone(), Arc::downgrade(&instance.clone()))] .iter() |