From 13896589c290e34420a7e4c31b33d1af3c4fe4d3 Mon Sep 17 00:00:00 2001 From: FrederickDoering Date: Sun, 24 Jan 2021 20:18:09 -0500 Subject: [PATCH] Made disabling payload conveyors output from routers more reliable. (#4433) Prevented reconstructors from being roughted to when disabled. Co-authored-by: frederick_efd --- .../world/blocks/distribution/PayloadConveyor.java | 8 +++----- core/src/mindustry/world/blocks/units/Reconstructor.java | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 122278238a..df51bef7ae 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -217,11 +217,9 @@ public class PayloadConveyor extends Block{ @Override public boolean acceptPayload(Building source, Payload payload){ - if(source == this){ - return this.item == null && payload.fits(payloadLimit); - } - //accepting payloads from units isn't supported - return this.item == null && progress <= 5f && payload.fits(payloadLimit); + return this.item == null + && payload.fits(payloadLimit) + && (source == this || this.enabled && progress <= 5f); } @Override diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index 1521511c15..c0fe54d27b 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -106,6 +106,7 @@ public class Reconstructor extends UnitBlock{ @Override public boolean acceptPayload(Building source, Payload payload){ return this.payload == null + && this.enabled && relativeTo(source) != rotation && payload instanceof UnitPayload && hasUpgrade(((UnitPayload)payload).unit.type);