From bc2f344c527f8d3f78b8d05fed28654c166282f5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 21 Apr 2024 09:53:54 -0400 Subject: [PATCH] Fixed #9765 --- core/src/mindustry/entities/Damage.java | 2 +- core/src/mindustry/world/blocks/payloads/PayloadLoader.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 158cba605b..a1e7263ad0 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -25,7 +25,6 @@ public class Damage{ private static final Rect rect = new Rect(); private static final Rect hitrect = new Rect(); private static final Vec2 vec = new Vec2(), seg1 = new Vec2(), seg2 = new Vec2(); - private static final Seq units = new Seq<>(); private static final IntSet collidedBlocks = new IntSet(); private static final IntFloatMap damages = new IntFloatMap(); private static final Seq collided = new Seq<>(); @@ -41,6 +40,7 @@ public class Damage{ public static void applySuppression(Team team, float x, float y, float range, float reload, float maxDelay, float applyParticleChance, @Nullable Position source){ applySuppression(team, x, y, range, reload, maxDelay, applyParticleChance, source, Pal.sapBullet); } + public static void applySuppression(Team team, float x, float y, float range, float reload, float maxDelay, float applyParticleChance, @Nullable Position source, Color effectColor){ builds.clear(); indexer.eachBlock(null, x, y, range, build -> build.team != team, build -> { diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java index 67a01ba0a7..9d9328597e 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java @@ -153,8 +153,9 @@ public class PayloadLoader extends PayloadBlock{ //load up items if(payload.block().hasItems && items.any()){ - boolean acceptedAny = false; + boolean acceptedAny = true; if(efficiency > 0.01f && timer(timerLoad, loadTime / efficiency)){ + acceptedAny = false; //load up items a set amount of times for(int j = 0; j < itemsLoaded && items.any(); j++){