diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index b2375f04b7..f3b57ce606 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -17,7 +17,6 @@ use serde::{Deserialize, Serialize}; use specs::{Component, FlaggedStorage}; use specs_idvs::IdvStorage; use std::time::Duration; -use tracing::error; use vek::Vec3; #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug, Serialize, Deserialize)] @@ -242,16 +241,6 @@ impl Asset for CharacterAbility { type Loader = assets::RonLoader; const EXTENSION: &'static str = "ron"; - - fn default_value(specifier: &str, err: assets::Error) -> Result { - error!( - ?err, - "Error loading CharacterAbility: {} for the ability map: replacing with default", - specifier - ); - - Ok(CharacterAbility::default()) - } } impl CharacterAbility { diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 6dc1fdc87b..de3b26c707 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -171,6 +171,11 @@ impl assets::Compound for ItemDef { kind, quality, } = raw; + + // Some commands like /give_item provide the asset specifier separated with \ + // instead of . + // + // TODO: This probably does not belong here let item_definition_id = specifier.replace('\\', "."); Ok(ItemDef {