From ef357fdf3667f3ded03203fc0f7cdec48a01ad8f Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Tue, 25 Mar 2025 11:17:39 -0500
Subject: 1.21.5 (#198)

* 25w02a

* move item_components codegen to a different module

* remove outdated test

* 25w03a

* start updating to 24w09b

* 1.21.5-pre2

* fix broken packets

* 1.21.5-rc2

* merge main

* delete unused acket_handling

* 1.21.5
---
 azalea-client/src/plugins/chunks.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'azalea-client/src/plugins/chunks.rs')

diff --git a/azalea-client/src/plugins/chunks.rs b/azalea-client/src/plugins/chunks.rs
index 089cc5d4..060b94e2 100644
--- a/azalea-client/src/plugins/chunks.rs
+++ b/azalea-client/src/plugins/chunks.rs
@@ -4,7 +4,6 @@
 
 use std::{
     io::Cursor,
-    ops::Deref,
     time::{Duration, Instant},
 };
 
@@ -15,7 +14,6 @@ use azalea_protocol::packets::game::{
 };
 use bevy_app::{App, Plugin, Update};
 use bevy_ecs::prelude::*;
-use simdnbt::owned::BaseNbt;
 use tracing::{error, trace};
 
 use super::packet::game::handle_outgoing_packets;
@@ -98,10 +96,7 @@ pub fn handle_receive_chunk_events(
             }
         }
 
-        let heightmaps_nbt = &event.packet.chunk_data.heightmaps;
-        // necessary to make the unwrap_or work
-        let empty_nbt = BaseNbt::default();
-        let heightmaps = heightmaps_nbt.unwrap_or(&empty_nbt).deref();
+        let heightmaps = &event.packet.chunk_data.heightmaps;
 
         if let Err(e) = partial_instance.chunks.replace_with_packet_data(
             &pos,
-- 
cgit v1.2.3