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

Read-only component fields / Removed get/set prefix

Browse Source
This commit is contained in:
Anuken
2020-02-04 12:14:09 -05:00
parent 1d0cfd4435
commit 36b9451e01
93 changed files with 637 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/game/MusicControl.java
View File

@@ -83,7 +83,7 @@ public class MusicControl{
/** Whether to play dark music.*/
private boolean isDark(){
if(state.teams.get(player.getTeam()).hasCore() && state.teams.get(player.getTeam()).core().healthf() < 0.85f){
if(state.teams.get(player.team()).hasCore() && state.teams.get(player.team()).core().healthf() < 0.85f){
//core damaged -> dark
return true;
}

5
core/src/mindustry/game/Teams.java
View File

@@ -5,7 +5,6 @@ import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.entities.type.*;
import mindustry.world.blocks.storage.CoreBlock.*;
import static mindustry.Vars.*;
@@ -102,7 +101,7 @@ public class Teams{
}
public void registerCore(CoreEntity core){
TeamData data = get(core.getTeam());
TeamData data = get(core.team());
//add core if not present
if(!data.cores.contains(core)){
data.cores.add(core);
@@ -117,7 +116,7 @@ public class Teams{
}
public void unregisterCore(CoreEntity entity){
TeamData data = get(entity.getTeam());
TeamData data = get(entity.team());
//remove core
data.cores.remove(entity);
//unregister in active list