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

Merge branch 'sam/fix-equip-slots' into 'master'

Browse Source 
Fix Equip Slots

See merge request veloren/veloren!2331
This commit is contained in:
Samuel Keiffer 2021-05-22 19:05:22 +00:00
commit 7488d8692b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/inventory/loadout.rs
View File

@ -172,8 +172,8 @@ impl Loadout {
assert_eq!(self.swap(equip_slot_a, item_b), None);
// Check if items are valid in their new positions
if !self.slot_can_hold(equip_slot_a, self.equipped(equip_slot_b).map(|x| x.kind()))
|| !self.slot_can_hold(equip_slot_b, self.equipped(equip_slot_a).map(|x| x.kind()))
if !self.slot_can_hold(equip_slot_a, self.equipped(equip_slot_a).map(|x| x.kind()))
|| !self.slot_can_hold(equip_slot_b, self.equipped(equip_slot_b).map(|x| x.kind()))
{
// If not, revert the swap
let item_a = self.swap(equip_slot_a, None);