More cleanup

This commit is contained in:
Anuken
2020-02-03 20:24:49 -05:00
parent 88d2ec5be8
commit a942ed2cad
141 changed files with 2213 additions and 1819 deletions

View File

@@ -311,7 +311,7 @@ public class Saves{
public void delete(){
file.delete();
saves.removeValue(this, true);
saves.remove(this, true);
if(this == current){
current = null;
}

View File

@@ -5,7 +5,6 @@ import arc.util.serialization.Json.Serializable;
import arc.util.serialization.JsonValue;
import mindustry.content.*;
import mindustry.ctype.ContentType;
import mindustry.entities.type.BaseUnit;
import mindustry.type.*;
import static mindustry.Vars.content;

View File

@@ -54,10 +54,10 @@ public class Teams{
return false;
}
public void eachEnemyCore(Team team, Cons<TileEntity> ret){
public void eachEnemyCore(Team team, Cons<Tilec> ret){
for(TeamData data : active){
if(areEnemies(team, data.team)){
for(TileEntity tile : data.cores){
for(Tilec tile : data.cores){
ret.get(tile);
}
}

View File

@@ -240,7 +240,7 @@ public class Tutorial{
//utility
static void placeBlocks(){
TileEntity core = state.teams.playerCores().first();
Tilec core = state.teams.playerCores().first();
for(int i = 0; i < blocksToBreak; i++){
world.ltile(core.tile.x + blockOffset, core.tile.y + i).remove();
world.tile(core.tile.x + blockOffset, core.tile.y + i).setBlock(Blocks.scrapWall, state.rules.defaultTeam);
@@ -248,7 +248,7 @@ public class Tutorial{
}
static boolean blocksBroken(){
TileEntity core = state.teams.playerCores().first();
Tilec core = state.teams.playerCores().first();
for(int i = 0; i < blocksToBreak; i++){
if(world.tile(core.tile.x + blockOffset, core.tile.y + i).block() == Blocks.scrapWall){