aboutsummaryrefslogtreecommitdiff
path: root/azalea-core
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2022-07-07 05:58:44 +0000
committerGitHub <noreply@github.com>2022-07-07 05:58:44 +0000
commit31e5629ce1c8267802bbcb9d03b60a299d474e59 (patch)
tree5968b48af9b0c30149e908b043966c41dda0a61d /azalea-core
parent27edd4f578e7b64fdaacefa26f691e2148707a8c (diff)
parent37d854c799236650da3deb025d8b32693531a27f (diff)
downloadazalea-drasl-31e5629ce1c8267802bbcb9d03b60a299d474e59.tar.xz
Merge branch 'main' into 1.19.1
Diffstat (limited to 'azalea-core')
-rw-r--r--azalea-core/src/particle/mod.rs2
-rw-r--r--azalea-core/src/position.rs12
2 files changed, 7 insertions, 7 deletions
diff --git a/azalea-core/src/particle/mod.rs b/azalea-core/src/particle/mod.rs
index 3b2e9807..46f88407 100644
--- a/azalea-core/src/particle/mod.rs
+++ b/azalea-core/src/particle/mod.rs
@@ -256,7 +256,7 @@ impl McBufReadable for ParticleData {
}
impl McBufWritable for ParticleData {
- fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
+ fn write_into(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
todo!()
}
}
diff --git a/azalea-core/src/position.rs b/azalea-core/src/position.rs
index 195558e8..64075aa7 100644
--- a/azalea-core/src/position.rs
+++ b/azalea-core/src/position.rs
@@ -182,9 +182,9 @@ impl From<ChunkSectionPos> for ChunkPos {
impl From<&BlockPos> for ChunkBlockPos {
fn from(pos: &BlockPos) -> Self {
ChunkBlockPos {
- x: pos.x.rem_euclid(16).abs() as u8,
+ x: pos.x.rem_euclid(16).unsigned_abs() as u8,
y: pos.y,
- z: pos.z.rem_euclid(16).abs() as u8,
+ z: pos.z.rem_euclid(16).unsigned_abs() as u8,
}
}
}
@@ -192,9 +192,9 @@ impl From<&BlockPos> for ChunkBlockPos {
impl From<&BlockPos> for ChunkSectionBlockPos {
fn from(pos: &BlockPos) -> Self {
ChunkSectionBlockPos {
- x: pos.x.rem(16).abs() as u8,
- y: pos.y.rem(16).abs() as u8,
- z: pos.z.rem(16).abs() as u8,
+ x: pos.x.rem(16).unsigned_abs() as u8,
+ y: pos.y.rem(16).unsigned_abs() as u8,
+ z: pos.z.rem(16).unsigned_abs() as u8,
}
}
}
@@ -203,7 +203,7 @@ impl From<&ChunkBlockPos> for ChunkSectionBlockPos {
fn from(pos: &ChunkBlockPos) -> Self {
ChunkSectionBlockPos {
x: pos.x,
- y: pos.y.rem(16).abs() as u8,
+ y: pos.y.rem(16).unsigned_abs() as u8,
z: pos.z,
}
}