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 Cargo.lock conflict

Browse Source 
Fixed `crossbeam-queue` being referenced  twice in the lockfile
This commit is contained in:
Joshua Barretto
2021-01-07 20:25:12 +00:00
committed by Marcel
parent 1d55dbd217
commit a4b9230f03
43 changed files with 134 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/sys/src/character_behavior.rs
View File

@ -29,7 +29,8 @@ fn incorporate_update(tuple: &mut JoinTuple, state_update: StateUpdate) {
*tuple.6.get_mut_unchecked() = state_update.energy
};
if state_update.swap_loadout {
let loadout = tuple.7.get_mut_unchecked();
let mut loadout = tuple.7.get_mut_unchecked();
let loadout = &mut *loadout;
std::mem::swap(&mut loadout.active_item, &mut loadout.second_item);
}
}