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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-07-24 13:51:00 -04:00
parent 1c8fd4cc38 f1cf8b2849
commit 961e2a2490
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -250,7 +250,7 @@ public class StackConveyor extends Block implements Autotiler{
@Override @Override
public boolean acceptItem(Building source, Item item){ public boolean acceptItem(Building source, Item item){
if(this == source) return true; // player threw items if(this == source) return true; // player threw items
if(cooldown > recharge - 1f) return false; // still cooling down if(cooldown > recharge - 1f) return false; // still cooling down
return !((state != stateLoad) // not a loading dock return !((state != stateLoad) // not a loading dock
|| (items.total() > 0 && !items.has(item)) // incompatible items || (items.total() > 0 && !items.has(item)) // incompatible items
|| (items.total() >= getMaximumAccepted(item)) // filled to capacity || (items.total() >= getMaximumAccepted(item)) // filled to capacity