From cbc0a13d9b19552976bc7177567cbaab9993127a Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 31 Aug 2022 18:50:59 +0000 Subject: fix a couple more possible panics --- .../src/packets/game/clientbound_update_recipes_packet.rs | 4 +++- azalea-protocol/src/read.rs | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'azalea-protocol/src') diff --git a/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs index da1485d0..1b10b221 100644 --- a/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs @@ -209,7 +209,9 @@ impl McBufReadable for Recipe { } else if recipe_type == ResourceLocation::new("minecraft:smithing").unwrap() { RecipeData::Smithing(SmithingRecipe::read_from(buf)?) } else { - panic!("Unknown recipe type sent by server: {}", recipe_type); + return Err(BufReadError::UnexpectedStringEnumVariant { + id: recipe_type.to_string(), + }); }; let recipe = Recipe { identifier, data }; diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs index 85340f5a..e2f6f0aa 100755 --- a/azalea-protocol/src/read.rs +++ b/azalea-protocol/src/read.rs @@ -172,10 +172,7 @@ where azalea_crypto::decrypt_packet(cipher, buf.filled_mut()); } } - match r { - Ok(()) => Poll::Ready(Ok(())), - Err(e) => panic!("{:?}", e), - } + Poll::Ready(r) } Poll::Pending => Poll::Pending, } -- cgit v1.2.3