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 bug with ignoring second_tool in EntityInfo

Browse Source
This commit is contained in:
juliancoffee 2021-07-05 01:08:26 +03:00
parent d920f911a2
commit 6654c9e372
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/sys/terrain.rs
View File

@ -208,6 +208,7 @@ impl<'a> System<'a> for Sys {
let EntityInfo { let EntityInfo {
skillset_asset, skillset_asset,
main_tool, main_tool,
second_tool,
loadout_asset, loadout_asset,
make_loadout, make_loadout,
trading_information: economy, trading_information: economy,
@ -234,6 +235,11 @@ impl<'a> System<'a> for Sys {
loadout_builder = loadout_builder.with_default_maintool(&body); loadout_builder = loadout_builder.with_default_maintool(&body);
} }
// If second tool is passed, use it as well
if let Some(second_tool) = second_tool {
loadout_builder = loadout_builder.active_offhand(Some(second_tool));
}
// If there is config, apply it. // If there is config, apply it.
// If not, use default equipement for this body. // If not, use default equipement for this body.
if let Some(asset) = loadout_asset { if let Some(asset) = loadout_asset {