jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

dont unwrap

Browse Source
This commit is contained in:
Andy Newjack 2020-05-23 01:16:02 -03:00
parent 629b53586d
commit 3524f38240
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/entity/item/mod.rs
View File

@ -118,15 +118,15 @@ impl ItemDetail {
.or(shield::ShieldType::parse_type([data[0],data[1],data[2]]).map(|s| ItemType::Shield(s)))
.or(unit::UnitType::parse_type([data[0],data[1],data[2]]).map(|u| ItemType::Unit(u)))
.or(mag::MagType::parse_type([data[0],data[1],data[2]]).map(|m| ItemType::Mag(m)))
.or(tool::ToolType::parse_type([data[0],data[1],data[2]]).map(|t| ItemType::Tool(t))).unwrap();
.or(tool::ToolType::parse_type([data[0],data[1],data[2]]).map(|t| ItemType::Tool(t))).ok()?;
match item_type {
ItemType::Weapon(_w) => Some(ItemDropType::Weapon(weapon::Weapon::from_bytes(data).unwrap())),
ItemType::Armor(_a) => Some(ItemDropType::Armor(armor::Armor::from_bytes(data).unwrap())),
ItemType::Shield(_s) => Some(ItemDropType::Shield(shield::Shield::from_bytes(data).unwrap())),
ItemType::Unit(_u) => Some(ItemDropType::Unit(unit::Unit::from_bytes(data).unwrap())),
ItemType::Mag(_m) => Some(ItemDropType::Mag(mag::Mag::from_bytes(data).unwrap())),
ItemType::Tool(_t) => Some(ItemDropType::Tool(tool::Tool::from_bytes(data).unwrap())),
ItemType::Weapon(_w) => Some(ItemDropType::Weapon(weapon::Weapon::from_bytes(data).ok()?)),
ItemType::Armor(_a) => Some(ItemDropType::Armor(armor::Armor::from_bytes(data).ok()?)),
ItemType::Shield(_s) => Some(ItemDropType::Shield(shield::Shield::from_bytes(data).ok()?)),
ItemType::Unit(_u) => Some(ItemDropType::Unit(unit::Unit::from_bytes(data).ok()?)),
ItemType::Mag(_m) => Some(ItemDropType::Mag(mag::Mag::from_bytes(data).ok()?)),
ItemType::Tool(_t) => Some(ItemDropType::Tool(tool::Tool::from_bytes(data).ok()?)),
_ => None,
}
}