diff options
| author | mat <github@matdoes.dev> | 2022-06-17 18:11:21 -0500 |
|---|---|---|
| committer | mat <github@matdoes.dev> | 2022-06-17 18:11:21 -0500 |
| commit | e2553bbaf2a550f4941b924e703a922345a1389f (patch) | |
| tree | 52334a1f01cd8910db7383a7618c771455e9624e /azalea-protocol/src | |
| parent | 9c0b6f6631f861cb1582c6bba41d2931ee26bf16 (diff) | |
| parent | 56f98c1b243d1ba8906ac73a2f2d8eec5646183e (diff) | |
| download | azalea-drasl-e2553bbaf2a550f4941b924e703a922345a1389f.tar.xz | |
Merge branch 'main' into 1.19.1
Diffstat (limited to 'azalea-protocol/src')
| -rw-r--r-- | azalea-protocol/src/mc_buf/read.rs | 2 | ||||
| -rw-r--r-- | azalea-protocol/src/mc_buf/write.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/azalea-protocol/src/mc_buf/read.rs b/azalea-protocol/src/mc_buf/read.rs index 7cb0bb09..ac8d5ccb 100644 --- a/azalea-protocol/src/mc_buf/read.rs +++ b/azalea-protocol/src/mc_buf/read.rs @@ -485,8 +485,8 @@ impl McBufReadable for BlockPos { impl McBufReadable for GlobalPos { fn read_into(buf: &mut impl Read) -> Result<Self, String> { Ok(GlobalPos { - pos: BlockPos::read_into(buf)?, dimension: ResourceLocation::read_into(buf)?, + pos: BlockPos::read_into(buf)?, }) } } diff --git a/azalea-protocol/src/mc_buf/write.rs b/azalea-protocol/src/mc_buf/write.rs index 80ffaecd..945477d0 100644 --- a/azalea-protocol/src/mc_buf/write.rs +++ b/azalea-protocol/src/mc_buf/write.rs @@ -398,8 +398,8 @@ impl McBufWritable for BlockPos { impl McBufWritable for GlobalPos { fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { - BlockPos::write_into(&self.pos, buf)?; ResourceLocation::write_into(&self.dimension, buf)?; + BlockPos::write_into(&self.pos, buf)?; Ok(()) } |
