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

Fix issue with villagers not having any item

Browse Source
This commit is contained in:
juliancoffee
2021-06-06 21:47:12 +03:00
parent 171c66d53d
commit 45e5554ff5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/comp/inventory/loadout_builder.rs
View File

@ -159,8 +159,8 @@ pub fn make_potion_bag(quantity: u32) -> Item {
// Also we are using default tools for un-specified species so // Also we are using default tools for un-specified species so
// it's fine to have wildcards // it's fine to have wildcards
#[allow(clippy::too_many_lines, clippy::match_wildcard_for_single_variants)] #[allow(clippy::too_many_lines, clippy::match_wildcard_for_single_variants)]
fn default_main_tool(body: &Body) -> Option<Item> { fn default_main_tool(body: &Body) -> Item {
match body { let maybe_tool = match body {
Body::Golem(golem) => match golem.species { Body::Golem(golem) => match golem.species {
golem::Species::StoneGolem => Some(Item::new_from_asset_expect( golem::Species::StoneGolem => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.stone_golems_fist", "common.items.npc_weapons.unique.stone_golems_fist",
@ -332,7 +332,9 @@ fn default_main_tool(body: &Body) -> Option<Item> {
)), )),
}, },
_ => None, _ => None,
} };
maybe_tool.unwrap_or_else(Item::empty)
} }
impl Default for LoadoutBuilder { impl Default for LoadoutBuilder {
@ -374,7 +376,7 @@ impl LoadoutBuilder {
#[must_use] #[must_use]
/// Set default active mainhand weapon based on `body` /// Set default active mainhand weapon based on `body`
pub fn with_default_maintool(self, body: &Body) -> Self { pub fn with_default_maintool(self, body: &Body) -> Self {
self.active_mainhand(default_main_tool(body)) self.active_mainhand(Some(default_main_tool(body)))
} }
#[must_use] #[must_use]