From 392dcf3092dbeda4a831075b425e0d35bc0c3373 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 13 Apr 2019 17:32:49 -0400 Subject: [PATCH] Made frozen forest less constricted / Tree block fix / Server crash fix --- core/assets/maps/frozenForest.mmap | Bin 8440 -> 8654 bytes .../mindustry/world/blocks/TreeBlock.java | 3 +++ .../anuke/mindustry/server/ServerControl.java | 8 ++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap index 39ec3bb9ee0018334a4822eef7a453954426708c..06354bf306c963e1b937cd05a238b142d1013402 100644 GIT binary patch delta 8246 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 R{~!HL`g8YZeO5Bt4FEw&)zbg~ diff --git a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java b/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java index 80bc1bdb78..11d110fc31 100644 --- a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java @@ -15,6 +15,9 @@ public class TreeBlock extends Block{ expanded = true; } + @Override + public void draw(Tile tile){} + @Override public void drawLayer(Tile tile){ Draw.rect(region, tile.drawx(), tile.drawy(), Mathf.randomSeed(tile.pos(), 0, 4) * 90); diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 5af2f4fc4c..323a6bde73 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -545,12 +545,16 @@ public class ServerControl implements ApplicationListener{ int slot = Strings.parseInt(arg[0]); if(!SaveIO.isSaveValid(slot)){ - err("No save data found for slot."); + err("No (valid) save data found for slot."); return; } Core.app.post(() -> { - SaveIO.loadFromSlot(slot); + try{ + SaveIO.loadFromSlot(slot); + }catch(Throwable t){ + err("Failed to load save. Outdated or corrupt file."); + } info("Save loaded."); host(); state.set(State.playing);