diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index 99b50170a3..5af3602acb 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -102,7 +102,7 @@ public class Sectors{ if(checkExpansion) { for (int x = sector.x; x < sector.x + sector.width; x++) { for (int y = sector.y; y < sector.y + sector.height; y++) { - if (grid.get(x, y) != null && (grid.get(x, y).hasSave() /*|| !canMerge(sector, grid.get(x, y))*/)) { + if (grid.get(x, y) != null && grid.get(x,y) != sector && grid.get(x, y).hasSave() /*|| !canMerge(sector, grid.get(x, y))*/) { //if a completed sector is hit, expansion failed //put back the values of the sector if (expandX < 0) sector.x -= expandX; diff --git a/core/src/io/anuke/mindustry/maps/TutorialSector.java b/core/src/io/anuke/mindustry/maps/TutorialSector.java index 5e54f0546e..ee0a81ed3d 100644 --- a/core/src/io/anuke/mindustry/maps/TutorialSector.java +++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java @@ -41,7 +41,7 @@ public class TutorialSector{ new WaveMission(2).setMessage("$tutorial.waves"), - new ActionMission(() -> { + new ActionMission(() -> Timers.runTask(30f, () -> { Runnable r = () -> { Array ores = Array.with(Items.copper, Items.coal, Items.lead); @@ -63,8 +63,7 @@ public class TutorialSector{ }else{ threads.run(r); } - }); - }), + })), new ItemMission(Items.lead, 150).setMessage("$tutorial.lead"), new ItemMission(Items.copper, 250).setMessage("$tutorial.morecopper"), @@ -131,6 +130,7 @@ public class TutorialSector{ }, new BattleMission(){ public void generate(Generation gen){} //no + public void onBegin(){} //also no }.setMessage("$tutorial.battle") );