aboutsummaryrefslogtreecommitdiff
path: root/azalea-core/src/position.rs
diff options
context:
space:
mode:
authorUbuntu <github@matdoes.dev>2022-08-30 19:56:14 +0000
committerUbuntu <github@matdoes.dev>2022-08-30 19:56:14 +0000
commita6c5017e387954342a65358347cf89deead68944 (patch)
treea1d92d6bb9da42262a2b64cd8e390c8c6e6cbbed /azalea-core/src/position.rs
parent5f0fe9f29ed8f56c4a62ff89605623b74d8ec87b (diff)
downloadazalea-drasl-a6c5017e387954342a65358347cf89deead68944.tar.xz
clippy
Diffstat (limited to 'azalea-core/src/position.rs')
-rw-r--r--azalea-core/src/position.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/azalea-core/src/position.rs b/azalea-core/src/position.rs
index 6a0de350..d0931a39 100644
--- a/azalea-core/src/position.rs
+++ b/azalea-core/src/position.rs
@@ -304,9 +304,9 @@ impl McBufReadable for BlockPos {
fn read_from(buf: &mut impl Read) -> Result<Self, BufReadError> {
let val = u64::read_from(buf)?;
println!("reading blockpos from {}", val);
- let x = (val << 64 - X_OFFSET - PACKED_X_LENGTH >> 64 - PACKED_X_LENGTH) as i32;
- let y = (val << 64 - PACKED_Y_LENGTH >> 64 - PACKED_Y_LENGTH) as i32;
- let z = (val << 64 - Z_OFFSET - PACKED_Z_LENGTH >> 64 - PACKED_Z_LENGTH) as i32;
+ let x = (val << (64 - X_OFFSET - PACKED_X_LENGTH) >> (64 - PACKED_X_LENGTH)) as i32;
+ let y = (val << (64 - PACKED_Y_LENGTH) >> (64 - PACKED_Y_LENGTH)) as i32;
+ let z = (val << (64 - Z_OFFSET - PACKED_Z_LENGTH) >> (64 - PACKED_Z_LENGTH)) as i32;
Ok(BlockPos { x, y, z })
}
}
@@ -335,7 +335,7 @@ impl McBufWritable for BlockPos {
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
let mut val: u64 = 0;
val |= ((self.x as u64) & PACKED_X_MASK) << X_OFFSET;
- val |= ((self.y as u64) & PACKED_Y_MASK) << 0;
+ val |= (self.y as u64) & PACKED_Y_MASK;
val |= ((self.z as u64) & PACKED_Z_MASK) << Z_OFFSET;
val.write_into(buf)
}