1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 14:26:04 +00:00

Add missing world border boolean to use item on packet in 1.21.2

This commit is contained in:
Shayne Hartford 2024-11-30 17:37:30 -05:00
parent f364ad6b21
commit 4c99752b0a
5 changed files with 12 additions and 1 deletions

View file

@ -136,6 +136,7 @@ pub fn handle_block_interact_event(
direction: hit_result.direction,
location: hit_result.location,
inside: hit_result.inside,
world_border: hit_result.world_border,
}
} else {
// we're not looking at the block, so make up some numbers
@ -144,6 +145,7 @@ pub fn handle_block_interact_event(
direction: Direction::Up,
location: event.position.center(),
inside: false,
world_border: false,
}
};

View file

@ -260,6 +260,7 @@ impl AABB {
block_pos: *pos,
inside: false,
miss: false,
world_border: false,
})
}

View file

@ -10,6 +10,7 @@ pub struct BlockHitResult {
pub block_pos: BlockPos,
pub miss: bool,
pub inside: bool,
pub world_border: bool,
}
impl BlockHitResult {
@ -20,6 +21,7 @@ impl BlockHitResult {
block_pos,
miss: true,
inside: false,
world_border: false,
}
}

View file

@ -439,6 +439,7 @@ impl VoxelShape {
location: right_after_start,
inside: true,
miss: false,
world_border: false,
})
} else {
AABB::clip_iterable(&self.to_aabbs(), from, to, block_pos)

View file

@ -27,8 +27,10 @@ pub struct BlockHit {
/// network, this is transmitted as the difference between the location and
/// block position.
pub location: Vec3,
/// Whether the player's head is inside of a block.
/// Whether the player's head is inside a block.
pub inside: bool,
/// Whether the player's hitting the world border.
pub world_border: bool,
}
impl AzaleaWrite for BlockHit {
@ -48,6 +50,7 @@ impl AzaleaWrite for BlockHit {
buf,
)?;
self.inside.azalea_write(buf)?;
self.world_border.azalea_write(buf)?;
Ok(())
}
}
@ -60,6 +63,7 @@ impl AzaleaRead for BlockHit {
let cursor_y = f32::azalea_read(buf)?;
let cursor_z = f32::azalea_read(buf)?;
let inside = bool::azalea_read(buf)?;
let world_border = bool::azalea_read(buf)?;
Ok(Self {
block_pos,
direction,
@ -69,6 +73,7 @@ impl AzaleaRead for BlockHit {
z: f64::from(block_pos.z) + f64::from(cursor_z),
},
inside,
world_border,
})
}
}