Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #9765

Browse Source
This commit is contained in:
Anuken
2024-04-21 09:53:54 -04:00
parent 0cdbeef980
commit bc2f344c52
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/Damage.java
View File

@@ -25,7 +25,6 @@ public class Damage{
private static final Rect rect = new Rect(); private static final Rect rect = new Rect();
private static final Rect hitrect = 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 Vec2 vec = new Vec2(), seg1 = new Vec2(), seg2 = new Vec2();
private static final Seq<Unit> units = new Seq<>();
private static final IntSet collidedBlocks = new IntSet(); private static final IntSet collidedBlocks = new IntSet();
private static final IntFloatMap damages = new IntFloatMap(); private static final IntFloatMap damages = new IntFloatMap();
private static final Seq<Collided> collided = new Seq<>(); private static final Seq<Collided> 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){ 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); 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){ 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(); builds.clear();
indexer.eachBlock(null, x, y, range, build -> build.team != team, build -> { indexer.eachBlock(null, x, y, range, build -> build.team != team, build -> {

3
core/src/mindustry/world/blocks/payloads/PayloadLoader.java
View File

@@ -153,8 +153,9 @@ public class PayloadLoader extends PayloadBlock{
//load up items //load up items
if(payload.block().hasItems && items.any()){ if(payload.block().hasItems && items.any()){
boolean acceptedAny = false; boolean acceptedAny = true;
if(efficiency > 0.01f && timer(timerLoad, loadTime / efficiency)){ if(efficiency > 0.01f && timer(timerLoad, loadTime / efficiency)){
acceptedAny = false;
//load up items a set amount of times //load up items a set amount of times
for(int j = 0; j < itemsLoaded && items.any(); j++){ for(int j = 0; j < itemsLoaded && items.any(); j++){