Fixed duct unloader works with core-linked storage (#7367)
This commit is contained in:
@@ -12,6 +12,7 @@ import mindustry.type.*;
|
|||||||
import mindustry.world.*;
|
import mindustry.world.*;
|
||||||
import mindustry.world.blocks.*;
|
import mindustry.world.blocks.*;
|
||||||
import mindustry.world.blocks.storage.CoreBlock.*;
|
import mindustry.world.blocks.storage.CoreBlock.*;
|
||||||
|
import mindustry.world.blocks.storage.StorageBlock.*;
|
||||||
import mindustry.world.meta.*;
|
import mindustry.world.meta.*;
|
||||||
|
|
||||||
import static mindustry.Vars.*;
|
import static mindustry.Vars.*;
|
||||||
@@ -84,7 +85,7 @@ public class DirectionalUnloader extends Block{
|
|||||||
if((unloadTimer += edelta()) >= speed){
|
if((unloadTimer += edelta()) >= speed){
|
||||||
Building front = front(), back = back();
|
Building front = front(), back = back();
|
||||||
|
|
||||||
if(front != null && back != null && back.items != null && front.team == team && back.team == team && back.canUnload() && (allowCoreUnload || !(back instanceof CoreBuild))){
|
if(front != null && back != null && back.items != null && front.team == team && back.team == team && back.canUnload() && (allowCoreUnload || !(back instanceof CoreBuild || (back instanceof StorageBuild sb && sb.linkedCore != null)))){
|
||||||
if(unloadItem == null){
|
if(unloadItem == null){
|
||||||
var itemseq = content.items();
|
var itemseq = content.items();
|
||||||
int itemc = itemseq.size;
|
int itemc = itemseq.size;
|
||||||
|
|||||||
Reference in New Issue
Block a user