Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Anuken
2020-01-06 17:20:16 -05:00
parent c307fc02cf 7f23803db1
commit 3ae8065cf1
163 changed files with 2568 additions and 1713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/maps/filters/CoreSpawnFilter.java
View File

@@ -23,7 +23,7 @@ public class CoreSpawnFilter extends GenerateFilter{
public void apply(Tiles tiles, GenerateInput in){
IntArray spawns = new IntArray();
for(Tile tile : tiles){
if(tile.getTeam() == defaultTeam && tile.block() instanceof CoreBlock){
if(tile.getTeam() == state.rules.defaultTeam && tile.block() instanceof CoreBlock){
spawns.add(tile.pos());
}
}
@@ -32,8 +32,7 @@ public class CoreSpawnFilter extends GenerateFilter{
int used = Math.min(spawns.size, amount);
for(int i = used; i < spawns.size; i++){
Tile tile = tiles.getp(spawns.get(i));
world.removeBlock(tile);
tiles.getp(spawns.get(i)).remove();
}
}

2
core/src/mindustry/maps/generators/MapGenerator.java
View File

@@ -68,7 +68,7 @@ public class MapGenerator extends Generator{
});
}
if(tile.block() instanceof CoreBlock && tile.getTeam() == defaultTeam){
if(tile.block() instanceof CoreBlock && tile.getTeam() == state.rules.defaultTeam){
schematics.placeLoadout(loadout, tile.x, tile.y);
anyCores = true;
}