From 497d7768514be157899fddf5b78f12613a9aee90 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sat, 3 Jan 2026 16:20:57 +0100 Subject: [PATCH] Serialize: Fix ItemDef regression introduced by 3d10d4e85 --- src/itemdef.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 499be739e1..7ed000911d 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -326,6 +326,10 @@ void ItemDefinition::deSerialize(std::istream &is, u16 protocol_version) short_description = deSerializeString16(is); + if (!canRead(is)) + break; + // >= 5.5.0-dev + if (protocol_version <= 43) { place_param2 = readU8(is); // assume disabled prediction @@ -333,13 +337,13 @@ void ItemDefinition::deSerialize(std::istream &is, u16 protocol_version) place_param2.reset(); } - sound_use.deSerializeSimple(is, protocol_version); - sound_use_air.deSerializeSimple(is, protocol_version); - if (!canRead(is)) break; // >= 5.8.0-dev + sound_use.deSerializeSimple(is, protocol_version); + sound_use_air.deSerializeSimple(is, protocol_version); + if (readU8(is)) // "have param2" place_param2 = readU8(is);