Fixed waves not appearing / Fixed ore tile blending

core/src/io/anuke/mindustry/core/Logic.java

@@ -132,7 +132,7 @@ public class Logic extends Module{
                 Entities.update(fireGroup);
                 Entities.update(playerGroup);
 
-                //effect group only contains item drops in the headless version, update it!
+                //effect group only contains item transfers in the headless version, update it!
                 if(headless){
                     Entities.update(effectGroup);
                 }

core/src/io/anuke/mindustry/game/SpawnGroup.java

@@ -85,7 +85,6 @@ public class SpawnGroup{
         if(wave < begin || wave > end || (wave - begin) % spacing != 0){
             return 0;
         }
-        float scaling = this.groupScaling;
 
         return Math.min(groupAmount - 1 + Math.max((int) ((wave / spacing) / groupScaling), 1), max);
     }

core/src/io/anuke/mindustry/maps/Sector.java

@@ -33,8 +33,6 @@ public class Sector{
     public transient Array<Mission> missions = new Array<>();
     /**Enemies spawned at this sector.*/
     public transient Array<SpawnGroup> spawns;
-    /**Ores that appear in this sector.*/
-    //public transient Array<Item> ores = new Array<>();
     /**Difficulty of the sector, measured by calculating distance from origin and applying scaling.*/
     public transient int difficulty;
     /**Items the player starts with on this sector.*/

core/src/io/anuke/mindustry/maps/Sectors.java

@@ -10,6 +10,7 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
 import io.anuke.mindustry.maps.missions.BattleMission;
+import io.anuke.mindustry.maps.missions.Mission;
 import io.anuke.mindustry.maps.missions.WaveMission;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
@@ -269,7 +270,9 @@ public class Sectors{
                     : new BattleMission());
         }
 
-        sector.spawns = sector.missions.first().getWaves(sector);
+        for(Mission mission : sector.missions){
+            sector.spawns.addAll(mission.getWaves(sector));
+        }
 
         //sector.ores.addAll(Items.copper);
 

core/src/io/anuke/mindustry/world/blocks/OreBlock.java

@@ -19,7 +19,7 @@ public class OreBlock extends Floor{
         this.base = base;
         this.variants = 3;
         this.minimapColor = ore.color;
-        this.blends = block -> block instanceof OreBlock && ((OreBlock) block).base != base;
+        this.blends = block -> (block instanceof OreBlock && ((OreBlock) block).base != base) || (!(block instanceof OreBlock) && block != base);
         this.tileBlends = (tile, other) -> tile.getElevation() < other.getElevation();
         this.edge = base.name;
     }