From afe02bf3a047ec4c881f83ff1b715e72565eabd1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 10 May 2022 22:55:28 -0400 Subject: [PATCH] Misc fixes --- core/src/mindustry/ai/types/CommandAI.java | 1 + core/src/mindustry/game/Saves.java | 4 +++- core/src/mindustry/ui/dialogs/ModsDialog.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java index 4364ad831d..1d5e98211c 100644 --- a/core/src/mindustry/ai/types/CommandAI.java +++ b/core/src/mindustry/ai/types/CommandAI.java @@ -79,6 +79,7 @@ public class CommandAI extends AIController{ if(move){ if(unit.type.circleTarget && attackTarget != null){ + target = attackTarget; circleAttack(80f); }else{ moveTo(vecOut, diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java index f0284ba1d7..12c60ca09e 100644 --- a/core/src/mindustry/game/Saves.java +++ b/core/src/mindustry/game/Saves.java @@ -21,6 +21,8 @@ import java.util.*; import static mindustry.Vars.*; public class Saves{ + private static final DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(); + Seq saves = new Seq<>(); @Nullable SaveSlot current; private @Nullable SaveSlot lastSectorSave; @@ -268,7 +270,7 @@ public class Saves{ } public String getDate(){ - return SimpleDateFormat.getDateTimeInstance().format(new Date(meta.timestamp)); + return dateFormat.format(new Date(meta.timestamp)); } public Map getMap(){ diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 20f0fd5165..0fed5ec1f5 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -44,7 +44,7 @@ public class ModsDialog extends BaseDialog{ private BaseDialog browser; private Table browserTable; - private float scoll = 0f; + private float scroll = 0f; public ModsDialog(){ super("@mods"); @@ -320,7 +320,7 @@ public class ModsDialog extends BaseDialog{ cont.pane(table1 -> { pane[0] = table1.margin(10f).top(); rebuild.get(""); - }).scrollX(false).update(s -> scoll = s.getScrollY()).get().setScrollYForce(scoll); + }).scrollX(false).update(s -> scroll = s.getScrollY()).get().setScrollYForce(scroll); }else{ cont.table(Styles.black6, t -> t.add("@mods.none")).height(80f); }