Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed units without an inventory being able to withdraw items

Browse Source
This commit is contained in:
Anuken
2018-06-25 19:37:04 -04:00
parent f464868934
commit b911ef98bb
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/UnitInventory.java
View File

@@ -123,7 +123,7 @@ public class UnitInventory implements Saveable{
} }
public boolean canAcceptItem(Item type){ public boolean canAcceptItem(Item type){
return !hasItem() || (item.item == type && unit.getItemCapacity() - item.amount > 0); return (!hasItem() && 1 <= unit.getItemCapacity()) || (item.item == type && unit.getItemCapacity() - item.amount > 0);
} }
public boolean canAcceptItem(Item type, int amount){ public boolean canAcceptItem(Item type, int amount){

1
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -112,7 +112,6 @@ public class BlockInventoryFragment implements Fragment {
if(!canPick.get() || items[f] == 0) return; if(!canPick.get() || items[f] == 0) return;
int amount = Math.min(Inputs.keyDown("item_withdraw") ? items[f] : 1, player.inventory.itemCapacityUsed(item)); int amount = Math.min(Inputs.keyDown("item_withdraw") ? items[f] : 1, player.inventory.itemCapacityUsed(item));
CallBlocks.requestItem(player, tile, item, amount); CallBlocks.requestItem(player, tile, item, amount);
}); });
table.add(image); table.add(image);