From f9ed74c15aedb7d9b52678d698c16515acef2f84 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 19 Jul 2020 09:32:57 -0400 Subject: [PATCH] Fixed #2243 --- core/src/mindustry/entities/Effects.java | 10 +++------- server/src/mindustry/server/ServerControl.java | 5 +++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/core/src/mindustry/entities/Effects.java b/core/src/mindustry/entities/Effects.java index c66aaabcf0..ed4cca412f 100644 --- a/core/src/mindustry/entities/Effects.java +++ b/core/src/mindustry/entities/Effects.java @@ -62,6 +62,9 @@ public class Effects{ public static void decal(TextureRegion region, float x, float y, float rotation, float lifetime, Color color){ if(headless || region == null || !Core.atlas.isFound(region)) return; + Tile tile = world.tileWorld(x, y); + if(tile == null || tile.floor().isLiquid) return; + Decal decal = Decal.create(); decal.set(x, y); decal.rotation(rotation); @@ -74,22 +77,15 @@ public class Effects{ public static void scorch(float x, float y, int size){ if(headless) return; - Tile tile = world.tileWorld(x, y); - if(tile == null || tile.floor().isLiquid) return; - size = Mathf.clamp(size, 0, 9); TextureRegion region = Core.atlas.find("scorch-" + size + "-" + Mathf.random(2)); decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble); - } public static void rubble(float x, float y, int blockSize){ if(headless) return; - Tile tile = world.tileWorld(x, y); - if(tile == null || tile.floor().isLiquid) return; - TextureRegion region = Core.atlas.find("rubble-" + blockSize + "-" + (Core.atlas.has("rubble-" + blockSize + "-1") ? Mathf.random(0, 1) : "0")); decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble); } diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 03703921c1..d24037002b 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -39,7 +39,8 @@ public class ServerControl implements ApplicationListener{ private static final int maxLogLength = 1024 * 512; protected static String[] tags = {"&lc&fb[D]", "&lg&fb[I]", "&ly&fb[W]", "&lr&fb[E]", ""}; - protected static DateTimeFormatter dateTime = DateTimeFormatter.ofPattern("MM-dd-yyyy HH:mm:ss"); + protected static DateTimeFormatter dateTime = DateTimeFormatter.ofPattern("MM-dd-yyyy HH:mm:ss"), + autosaveDate = DateTimeFormatter.ofPattern("MM_dd_yyyy_HH_mm_ss"); private final CommandHandler handler = new CommandHandler(""); private final Fi logFolder = Core.settings.getDataDirectory().child("logs/"); @@ -167,7 +168,7 @@ public class ServerControl implements ApplicationListener{ //use map file name to make sure it can be saved String mapName = (state.map.file == null ? "unknown" : state.map.file.nameWithoutExtension()).replace(" ", "_"); - String date = dateTime.format(LocalDateTime.now()).replace(" ", "_"); + String date = autosaveDate.format(LocalDateTime.now()); Seq autosaves = saveDirectory.findAll(f -> f.name().startsWith("auto_")); autosaves.sort(f -> -f.lastModified());