From 109ba8462595a15f5f4c270f122a4dd86485096f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 26 Aug 2023 22:32:43 -0400 Subject: [PATCH] Don't allow loaders to accept items/liquids from unloaders --- core/src/mindustry/world/blocks/payloads/PayloadLoader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java index cb9f863e92..1a8b7844fa 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java @@ -11,6 +11,7 @@ import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; import mindustry.ui.*; +import mindustry.world.blocks.payloads.PayloadUnloader.*; import static mindustry.Vars.*; @@ -106,12 +107,12 @@ public class PayloadLoader extends PayloadBlock{ @Override public boolean acceptItem(Building source, Item item){ - return items.total() < itemCapacity; + return items.total() < itemCapacity && !(source instanceof PayloadUnloaderBuild); } @Override public boolean acceptLiquid(Building source, Liquid liquid){ - return liquids.current() == liquid || liquids.currentAmount() < 0.2f; + return (liquids.current() == liquid || liquids.currentAmount() < 0.2f) && !(source instanceof PayloadUnloaderBuild); } @Override