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

Fixed #4335

Browse Source
This commit is contained in:
Anuken
2021-01-15 12:38:42 -05:00
parent 136c8cfcd2
commit 6ec76409ef
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,6 +267,12 @@ public class StackConveyor extends Block implements Autotiler{
link = -1; link = -1;
} }
@Override
public int acceptStack(Item item, int amount, Teamc source){
if(items.any() && !items.has(item)) return 0;
return super.acceptStack(item, amount, source);
}
@Override @Override
public void handleItem(Building source, Item item){ public void handleItem(Building source, Item item){
if(items.empty()) poofIn(); if(items.empty()) poofIn();
@@ -301,7 +307,7 @@ public class StackConveyor extends Block implements Autotiler{
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.any() && !items.has(item)) // incompatible items
|| (items.total() >= getMaximumAccepted(item)) // filled to capacity || (items.total() >= getMaximumAccepted(item)) // filled to capacity
|| (front() == source)); || (front() == source));
} }