diff --git a/core/assets/maps/impact0078.msav b/core/assets/maps/impact0078.msav index fae74556ad..33eeb316ff 100644 Binary files a/core/assets/maps/impact0078.msav and b/core/assets/maps/impact0078.msav differ diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index e1298b48d5..c07a990f2b 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -151,7 +151,7 @@ public class StatusEffects implements ContentList{ boss = new StatusEffect("boss"){{ color = Pal.health; permanent = true; - damageMultiplier = 1.5f; + damageMultiplier = 1.3f; healthMultiplier = 1.5f; }}; diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 166b7e9e5c..b8d1f1e522 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -51,7 +51,7 @@ public class Drawf{ } private static boolean allowLight(Team team){ - return team == Team.derelict || team == Vars.player.team() || state.rules.enemyLights; + return renderer != null && (team == Team.derelict || team == Vars.player.team() || state.rules.enemyLights); } public static void selected(Building tile, Color color){ diff --git a/core/src/mindustry/mod/ModLoadingSound.java b/core/src/mindustry/mod/ModLoadingSound.java index a876c25f68..6cf65b1d30 100644 --- a/core/src/mindustry/mod/ModLoadingSound.java +++ b/core/src/mindustry/mod/ModLoadingSound.java @@ -77,16 +77,6 @@ public class ModLoadingSound implements Sound{ sound.stop(); } - @Override - public void pause(){ - sound.pause(); - } - - @Override - public void resume(){ - sound.resume(); - } - @Override public void dispose(){ sound.dispose(); diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index b0fb3e4b7e..4883206e25 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -226,7 +226,7 @@ public class PowerNode extends PowerBlock{ if(otherReq == null || otherReq.block == null) return; - drawLaser(player.team(), req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy(), size, otherReq.block.size); + drawLaser(player == null ? Team.sharded : player.team(), req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy(), size, otherReq.block.size); } Draw.color(); } diff --git a/server/src/mindustry/server/ServerLauncher.java b/server/src/mindustry/server/ServerLauncher.java index 29451cb6ac..02a740a8a5 100644 --- a/server/src/mindustry/server/ServerLauncher.java +++ b/server/src/mindustry/server/ServerLauncher.java @@ -33,7 +33,7 @@ public class ServerLauncher implements ApplicationListener{ String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level1.ordinal()] + " " + text + "&fr"); System.out.println(result); }; - new HeadlessApplication(new ServerLauncher(), null, throwable -> CrashSender.send(throwable, f -> {})); + new HeadlessApplication(new ServerLauncher(), throwable -> CrashSender.send(throwable, f -> {})); }catch(Throwable t){ CrashSender.send(t, f -> {}); } diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index c4ae93123a..61a8eebe1b 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -69,7 +69,7 @@ public class ApplicationTests{ } }; - new HeadlessApplication(core, null, throwable -> exceptionThrown[0] = throwable); + new HeadlessApplication(core, throwable -> exceptionThrown[0] = throwable); while(!begins[0]){ if(exceptionThrown[0] != null){