diff --git a/core/assets-raw/sprites/blocks/defense/shock-mine-team-top.png b/core/assets-raw/sprites/blocks/defense/shock-mine-team-top.png index 58597159bf..e215e1a1ea 100644 Binary files a/core/assets-raw/sprites/blocks/defense/shock-mine-team-top.png and b/core/assets-raw/sprites/blocks/defense/shock-mine-team-top.png differ diff --git a/core/src/mindustry/entities/comp/FireComp.java b/core/src/mindustry/entities/comp/FireComp.java index ea520c0075..3a767fb898 100644 --- a/core/src/mindustry/entities/comp/FireComp.java +++ b/core/src/mindustry/entities/comp/FireComp.java @@ -35,7 +35,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{ baseFlammability = -1, puddleFlammability, damageTimer = Mathf.random(40f), spreadTimer = Mathf.random(spreadDelay), fireballTimer = Mathf.random(fireballDelay), warmup = 0f, - animation = Mathf.random(frames); + animation = Mathf.random(frames - 1); @Override public void update(){ @@ -116,7 +116,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{ Draw.alpha(Mathf.clamp(warmup / warmupDuration)); Draw.z(Layer.effect); - Draw.rect(regions[(int)animation], x, y); + Draw.rect(regions[Math.min((int)animation, regions.length - 1)], x, y); Draw.reset(); Drawf.light(x, y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f * Mathf.clamp(warmup / warmupDuration));