From 91f19a5c81ef81d634b4c6642fd49544249c3075 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 2 Apr 2022 17:33:35 -0400 Subject: [PATCH] Misc --- core/src/mindustry/audio/SoundControl.java | 2 +- core/src/mindustry/content/UnitTypes.java | 2 +- core/src/mindustry/net/ArcNetProvider.java | 2 +- core/src/mindustry/ui/dialogs/PlanetDialog.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/audio/SoundControl.java b/core/src/mindustry/audio/SoundControl.java index 1441f42832..e22d5370aa 100644 --- a/core/src/mindustry/audio/SoundControl.java +++ b/core/src/mindustry/audio/SoundControl.java @@ -17,7 +17,7 @@ import static mindustry.Vars.*; /** Controls playback of multiple audio tracks.*/ public class SoundControl{ - protected static final float finTime = 120f, foutTime = 120f, musicInterval = 3f * Time.toMinutes, musicChance = 0.6f, musicWaveChance = 0.46f; + public float finTime = 120f, foutTime = 120f, musicInterval = 3f * Time.toMinutes, musicChance = 0.6f, musicWaveChance = 0.46f; /** normal, ambient music, plays at any time */ public Seq ambientMusic = Seq.with(); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 6fc71291a6..7c4cfe37f4 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3166,7 +3166,7 @@ public class UnitTypes{ shoot = new ShootHelix(); //TODO cooler + balancing - bullet = new BasicBulletType(5f, 20){{ + bullet = new BasicBulletType(5f, 25){{ width = 7f; height = 12f; lifetime = 25f; diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java index f20f190c34..f65d40c660 100644 --- a/core/src/mindustry/net/ArcNetProvider.java +++ b/core/src/mindustry/net/ArcNetProvider.java @@ -24,7 +24,7 @@ import static mindustry.Vars.*; public class ArcNetProvider implements NetProvider{ final Client client; final Prov packetSupplier = () -> new DatagramPacket(new byte[512], 512); - final ExecutorService executor = Threads.executor(Math.max(Runtime.getRuntime().availableProcessors(), 6)); + final ExecutorService executor = Threads.executor(1); final Server server; final CopyOnWriteArrayList connections = new CopyOnWriteArrayList<>(); diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 83124bbbde..94f1e97563 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -849,7 +849,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ //export displayItems(c, sector.getProductionScale(), sector.info.export, "@sectors.export", t -> { - if(sector.info.destination != null){ + if(sector.info.destination != null && sector.info.destination.hasBase()){ String ic = sector.info.destination.iconChar(); t.add(Iconc.rightOpen + " " + (ic == null || ic.isEmpty() ? "" : ic + " ") + sector.info.destination.name()).padLeft(10f).row(); }