diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 6c6c61c474..7c0bbb7821 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -20,6 +20,7 @@ public class PayloadConveyor extends Block{ public @Load("@-top") TextureRegion topRegion; public @Load("@-edge") TextureRegion edgeRegion; public Interp interp = Interp.pow5; + public float payloadLimit = 2.5f; public PayloadConveyor(String name){ super(name); @@ -216,10 +217,10 @@ public class PayloadConveyor extends Block{ @Override public boolean acceptPayload(Building source, Payload payload){ if(source == this){ - return this.item == null && payload.fits(); + return this.item == null && payload.fits(payloadLimit); } //accepting payloads from units isn't supported - return this.item == null && progress <= 5f && payload.fits(); + return this.item == null && progress <= 5f && payload.fits(payloadLimit); } @Override diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java index 2caadf8eb6..21b073d56e 100644 --- a/core/src/mindustry/world/blocks/payloads/Payload.java +++ b/core/src/mindustry/world/blocks/payloads/Payload.java @@ -25,9 +25,9 @@ public interface Payload{ return false; } - /** @return whether this payload fits on a standard 3x3 conveyor. */ - default boolean fits(){ - return size() / tilesize <= 2.5f; + /** @return whether this payload fits in a given size. 2.5 is the max for a standard 3x3 conveyor. */ + default boolean fits(float s){ + return size() / tilesize <= s; } /** writes the payload for saving. */