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 'xvar/fix-stackable-item-pickup' into 'master'

Browse Source 
Fixed a bug which prevented picking up stackable items with a full inventory

Closes #921

See merge request veloren/veloren!1683
This commit is contained in:
Joshua Barretto 2021-01-09 01:23:14 +00:00
commit 3d46d51871
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,6 +443,10 @@ impl Inventory {
/// containing items aren't inserted into the inventory as this is not
/// currently supported.
pub fn pickup_item(&mut self, mut item: Item) -> Result<(), Item> {
if item.is_stackable() {
return self.push(item).map_or(Ok(()), Err);
}
if self.free_slots() < item.populated_slots() + 1 {
return Err(item);
}