Merge branch 'unsector'

# Conflicts: # core/src/io/anuke/mindustry/maps/SectorPresets.java # core/src/io/anuke/mindustry/maps/Sectors.java # core/src/io/anuke/mindustry/maps/TutorialSector.java # core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java # core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java # core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
2019-01-08 22:28:13 -05:00
parent dc0be93b25 47f7507af3
commit 28fa0b070d
53 changed files with 68 additions and 2445 deletions
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -101,12 +101,6 @@ public class ApplicationTests{
        assertTrue(content.getContentMap().length > 0);
    }

-    @Test
-    void loadSector(){
-        world.sectors.createSector(0, 0);
-        world.sectors.playSector(world.sectors.get(0, 0));
-    }
-
    @Test
    void playMap(){
        assertTrue(world.maps.all().size > 0);