diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 9ee4287fa5..af3d649437 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -193,7 +193,7 @@ public class Control implements ApplicationListener, Loadable{ if(!settings.getBool("skipcoreanimation") && !state.rules.pvp){ coreDelay = coreLandDuration; //delay player respawn so animation can play. - player.deathTimer = -80f; + player.deathTimer = Player.deathDelay - coreLandDuration; //TODO this sounds pretty bad due to conflict if(settings.getInt("musicvol") > 0){ Musics.land.stop(); diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 50c1ec4dda..e1a59051ec 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -395,7 +395,7 @@ public class CoreBlock extends StorageBlock{ if(renderer.getLandTime() >= 1f){ tile.getLinkedTiles(t -> { if(Mathf.chance(0.4f)){ - Fx.coreLandDust.at(t.worldx(), t.worldy(), angleTo(t) + Mathf.range(30f), Tmp.c1.set(t.floor().mapColor).mul(1.5f + Mathf.range(0.15f))); + Fx.coreLandDust.at(t.worldx(), t.worldy(), angleTo(t.worldx(), t.worldy()) + Mathf.range(30f), Tmp.c1.set(t.floor().mapColor).mul(1.5f + Mathf.range(0.15f))); } });