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

Fixed possible crash in crafting UI

Browse Source
This commit is contained in:
Sam 2023-04-01 21:58:57 -04:00
parent 7fab9d192b
commit d523d31056
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,6 +348,21 @@ impl ItemKind {
}; };
result result
} }
pub fn has_durability(&self) -> bool {
match self {
ItemKind::Tool(_) => true,
ItemKind::Armor(armor) => armor.kind.has_durability(),
ItemKind::ModularComponent(_)
| ItemKind::Lantern(_)
| ItemKind::Glider
| ItemKind::Consumable { .. }
| ItemKind::Throwable { .. }
| ItemKind::Utility { .. }
| ItemKind::Ingredient { .. }
| ItemKind::TagExamples { .. } => false,
}
}
} }
pub type ItemId = AtomicCell<Option<NonZeroU64>>; pub type ItemId = AtomicCell<Option<NonZeroU64>>;
@ -1215,20 +1230,7 @@ impl Item {
DurabilityMultiplier(mult) DurabilityMultiplier(mult)
} }
pub fn has_durability(&self) -> bool { pub fn has_durability(&self) -> bool { self.kind().has_durability() }
match &*self.kind() {
ItemKind::Tool(_) => true,
ItemKind::Armor(armor) => armor.kind.has_durability(),
ItemKind::ModularComponent(_)
| ItemKind::Lantern(_)
| ItemKind::Glider
| ItemKind::Consumable { .. }
| ItemKind::Throwable { .. }
| ItemKind::Utility { .. }
| ItemKind::Ingredient { .. }
| ItemKind::TagExamples { .. } => false,
}
}
pub fn increment_damage(&mut self, ability_map: &AbilityMap, msm: &MaterialStatManifest) { pub fn increment_damage(&mut self, ability_map: &AbilityMap, msm: &MaterialStatManifest) {
if let Some(durability_lost) = &mut self.durability_lost { if let Some(durability_lost) = &mut self.durability_lost {
@ -1351,7 +1353,7 @@ impl ItemDesc for ItemDef {
fn components(&self) -> &[Item] { &[] } fn components(&self) -> &[Item] { &[] }
fn has_durability(&self) -> bool { false } fn has_durability(&self) -> bool { self.kind().has_durability() }
fn durability(&self) -> Option<u32> { None } fn durability(&self) -> Option<u32> { None }