neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-04-04 12:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

world/text_value: do not fall back to NBT deserialization after DataVersion 4290

Browse source 
An invalid JSON string should not be emitted verbatim; ignore the
content instead.

Also increment entity meta version, which had been forgotten in the
previous commit.
This commit is contained in:
Matthias Schiffer 2025-04-03 18:26:49 +02:00
parent dd56e842b5
commit ca880ab3b4
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/common.rs
View file

@ -48,7 +48,7 @@ pub const MIPMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
/// MinedMap processed entity data version number
///
/// Increase when entity collection changes bacause of code changes.
pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2);
pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
/// Coordinate pair of a generated tile
///

19
src/world/text_value.rs
View file

@ -176,15 +176,20 @@ pub struct TextValue(pub fastnbt::Value);
impl TextValue {
/// Deserializes a [TextValue] into a [DeserializedText]
pub fn deserialize(&self, data_version: u32) -> DeserializedText {
// TODO: Improve error handling
//
// Unfortunately, there are a number of weird ways an empty sign coould
// be encoded (for example a compound with an "" key), so for now we
// simply interpret undecodable data as empty.
if data_version < 4290 {
if let fastnbt::Value::String(json) = &self.0 {
if let Ok(content) = serde_json::from_str(json) {
return content;
}
}
}
let fastnbt::Value::String(json) = &self.0 else {
return DeserializedText::default();
};
fastnbt::from_value(&self.0).unwrap_or_default()
serde_json::from_str(json).unwrap_or_default()
} else {
fastnbt::from_value(&self.0).unwrap_or_default()
}
}
}