diff options
| author | mat <git@matdoes.dev> | 2025-10-30 19:50:37 +0100 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2025-10-30 19:50:37 +0100 |
| commit | 7d0c7553fd5a0210285a51a65c10f898f641a0cc (patch) | |
| tree | 2bfc5747c55622082761f7d6e3cabf86ed8ae2e4 /azalea-physics/src/collision | |
| parent | 03a496fc7d952b1136cb717f2e8d1ccfb798ee64 (diff) | |
| download | azalea-drasl-7d0c7553fd5a0210285a51a65c10f898f641a0cc.tar.xz | |
Remove unnecessary MoveEntityError and MovePlayerError types and other cleanup
Diffstat (limited to 'azalea-physics/src/collision')
| -rw-r--r-- | azalea-physics/src/collision/mod.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs index 3702c8c1..10b607f2 100644 --- a/azalea-physics/src/collision/mod.rs +++ b/azalea-physics/src/collision/mod.rs @@ -18,7 +18,7 @@ use azalea_entity::{ Attributes, Jumping, LookDirection, OnClimbable, Physics, PlayerAbilities, Pose, Position, metadata::Sprinting, }; -use azalea_world::{ChunkStorage, Instance, MoveEntityError}; +use azalea_world::{ChunkStorage, Instance}; use bevy_ecs::{entity::Entity, world::Mut}; pub use blocks::BlockWithShape; pub use discrete_voxel_shape::*; @@ -130,7 +130,7 @@ pub struct MoveCtx<'world, 'state, 'a, 'b> { /// /// In Mojmap, this is `Entity.move`. #[allow(clippy::too_many_arguments)] -pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) -> Result<(), MoveEntityError> { +pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) { // TODO: do all these // if self.no_physics { @@ -225,8 +225,8 @@ pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) -> Result<(), MoveE // this.tryCheckInsideBlocks(); // float var25 = this.getBlockSpeedFactor(); - // this.setDeltaMovement(this.getDeltaMovement().multiply((double)var25, 1.0D, - // (double)var25)); if (this.level.getBlockStatesIfLoaded(this. + // this.setDeltaMovement(this.getDeltaMovement().multiply((double)var25, + // 1.0D, (double)var25)); if (this.level.getBlockStatesIfLoaded(this. // getBoundingBox().deflate(1.0E-6D)).noneMatch((var0) -> { // return var0.is(BlockTags.FIRE) || var0.is(Blocks.LAVA); // })) { @@ -239,11 +239,9 @@ pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) -> Result<(), MoveE // playEntityOnFireExtinguishedSound(); } // } - // if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) - // { this.setRemainingFireTicks(-this.getFireImmuneTicks()); - // } - - Ok(()) + // if (this.isOnFire() && (this.isInPowderSnow || + // this.isInWaterRainOrBubble())) { this.setRemainingFireTicks(-this. + // getFireImmuneTicks()); } } fn check_fall_damage( |