From e6a787f77752da4593964eba775e82f8c6d282b4 Mon Sep 17 00:00:00 2001 From: EightFactorial <29801334+EightFactorial@users.noreply.github.com> Date: Thu, 7 Sep 2023 10:40:53 -0700 Subject: Don't crash when missing extra registries (#108) * Fix decoding on missing Nbt structures * Fix default and renaming --- azalea-protocol/src/packets/game/clientbound_login_packet.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'azalea-protocol/src/packets') diff --git a/azalea-protocol/src/packets/game/clientbound_login_packet.rs b/azalea-protocol/src/packets/game/clientbound_login_packet.rs index b57fe66f..3b8ae03d 100755 --- a/azalea-protocol/src/packets/game/clientbound_login_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_login_packet.rs @@ -101,14 +101,14 @@ pub mod registry { #[serde(rename = "minecraft:trim_material")] pub trim_material: RegistryType, #[cfg(not(feature = "strict_registry"))] - #[serde(rename = "minecraft:trim_material")] + #[serde(default, rename = "minecraft:trim_material")] pub trim_material: Nbt, #[cfg(feature = "strict_registry")] #[serde(rename = "minecraft:chat_type")] pub chat_type: RegistryType, #[cfg(not(feature = "strict_registry"))] - #[serde(rename = "minecraft:chat_type")] + #[serde(default, rename = "minecraft:chat_type")] pub chat_type: Nbt, #[serde(rename = "minecraft:dimension_type")] @@ -118,21 +118,21 @@ pub mod registry { #[serde(rename = "minecraft:worldgen/biome")] pub world_type: RegistryType, #[cfg(not(feature = "strict_registry"))] - #[serde(rename = "minecraft:worldgen/biome")] + #[serde(default, rename = "minecraft:worldgen/biome")] pub world_type: Nbt, #[cfg(feature = "strict_registry")] #[serde(rename = "minecraft:trim_pattern")] pub trim_pattern: RegistryType, #[cfg(not(feature = "strict_registry"))] - #[serde(rename = "minecraft:trim_pattern")] + #[serde(default, rename = "minecraft:trim_pattern")] pub trim_pattern: Nbt, #[cfg(feature = "strict_registry")] #[serde(rename = "minecraft:damage_type")] pub damage_type: RegistryType, #[cfg(not(feature = "strict_registry"))] - #[serde(rename = "minecraft:damage_type")] + #[serde(default, rename = "minecraft:damage_type")] pub damage_type: Nbt, } -- cgit v1.2.3