Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'isse/fix-give' into 'master'

Browse Source 
Don't crash with the give_item command with wrong item path

See merge request veloren/veloren!4495
This commit is contained in:
Isse 2024-06-06 17:28:01 +00:00
commit c205a1fae2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/comp/inventory/item/mod.rs
View File

@ -612,7 +612,8 @@ impl<'de> Deserialize<'de> for ItemBase {
where where
E: de::Error, E: de::Error,
{ {
Ok(ItemBase::from_item_id_string(serialized_item_base)) ItemBase::from_item_id_string(serialized_item_base)
.map_err(|err| E::custom(err.to_string()))
} }
} }
@ -637,11 +638,15 @@ impl ItemBase {
} }
} }
fn from_item_id_string(item_id_string: &str) -> Self { fn from_item_id_string(item_id_string: &str) -> Result<Self, Error> {
if item_id_string.starts_with(crate::modular_item_id_prefix!()) { if item_id_string.starts_with(crate::modular_item_id_prefix!()) {
ItemBase::Modular(ModularBase::load_from_pseudo_id(item_id_string)) Ok(ItemBase::Modular(ModularBase::load_from_pseudo_id(
item_id_string,
)))
} else { } else {
ItemBase::Simple(Arc::<ItemDef>::load_expect_cloned(item_id_string)) Ok(ItemBase::Simple(Arc::<ItemDef>::load_cloned(
item_id_string,
)?))
} }
} }
} }
@ -1037,7 +1042,7 @@ impl Item {
/// Creates a new instance of an `Item from the provided asset identifier if /// Creates a new instance of an `Item from the provided asset identifier if
/// it exists /// it exists
pub fn new_from_asset(asset: &str) -> Result<Self, Error> { pub fn new_from_asset(asset: &str) -> Result<Self, Error> {
let inner_item = ItemBase::from_item_id_string(asset); let inner_item = ItemBase::from_item_id_string(asset)?;
// TODO: Get msm and ability_map less hackily // TODO: Get msm and ability_map less hackily
let msm = &MaterialStatManifest::load().read(); let msm = &MaterialStatManifest::load().read();
let ability_map = &AbilityMap::load().read(); let ability_map = &AbilityMap::load().read();