From 4a7774fe5a7b7dfb93fe87c258c5919310535f1d Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 15 Nov 2021 06:27:22 -0800 Subject: [PATCH] Dynamic resupply check (#6338) --- core/src/mindustry/entities/comp/BuildingComp.java | 4 ++++ core/src/mindustry/type/ammo/ItemAmmoType.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 26dc1284e1..b300c01499 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -434,6 +434,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return block.unloadable; } + public boolean canResupply(){ + return block.allowResupply; + } + public boolean payloadCheck(int conveyorRotation){ return block.rotate && (rotation + 2) % 4 == conveyorRotation; } diff --git a/core/src/mindustry/type/ammo/ItemAmmoType.java b/core/src/mindustry/type/ammo/ItemAmmoType.java index 6263209e75..dfa7871525 100644 --- a/core/src/mindustry/type/ammo/ItemAmmoType.java +++ b/core/src/mindustry/type/ammo/ItemAmmoType.java @@ -46,7 +46,7 @@ public class ItemAmmoType implements AmmoType{ float range = unit.hitSize + this.range; - Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.block.allowResupply && u.items.has(item)); + Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.canResupply() && u.items.has(item)); if(build != null){ Fx.itemTransfer.at(build.x, build.y, ammoPerItem / 2f, item.color, unit);