Game state cleanup

2020-03-31 14:16:38 -04:00
parent 9081f3ff03
commit f1fd072400
20 changed files with 51 additions and 71 deletions
--- a/core/src/mindustry/maps/generators/FileMapGenerator.java
+++ b/core/src/mindustry/maps/generators/FileMapGenerator.java
@@ -22,6 +22,7 @@ public class FileMapGenerator implements WorldGenerator{

    @Override
    public void generate(Tiles tiles){
+        if(true) throw new IllegalArgumentException("no!");
        tiles.fill();

        SaveIO.load(map.file);
@@ -60,6 +61,6 @@ public class FileMapGenerator implements WorldGenerator{
        }

        world.prepareTiles(tiles);
-        world.setMap(map);
+        state.map = map;
    }
 }