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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-08-11 11:18:32 -04:00
parent 2b96d30255
commit d85f6c72eb
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/game/Team.java
View File

@@ -91,8 +91,7 @@ public class Team implements Comparable<Team>{
return state.teams.get(this); return state.teams.get(this);
} }
public @Nullable public @Nullable CoreBuild core(){
CoreBuild core(){
return data().core(); return data().core();
} }

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

@@ -21,8 +21,7 @@ public class Teams{
active.add(get(Team.crux)); active.add(get(Team.crux));
} }
public @Nullable public @Nullable CoreBuild closestEnemyCore(float x, float y, Team team){
CoreBuild closestEnemyCore(float x, float y, Team team){
for(Team enemy : team.enemies()){ for(Team enemy : team.enemies()){
CoreBuild tile = Geometry.findClosest(x, y, enemy.cores()); CoreBuild tile = Geometry.findClosest(x, y, enemy.cores());
if(tile != null) return tile; if(tile != null) return tile;
@@ -30,8 +29,7 @@ public class Teams{
return null; return null;
} }
public @Nullable public @Nullable CoreBuild closestCore(float x, float y, Team team){
CoreBuild closestCore(float x, float y, Team team){
return Geometry.findClosest(x, y, get(team).cores); return Geometry.findClosest(x, y, get(team).cores);
} }
@@ -168,8 +166,7 @@ public class Teams{
return cores.isEmpty(); return cores.isEmpty();
} }
public @Nullable public @Nullable CoreBuild core(){
CoreBuild core(){
return cores.isEmpty() ? null : cores.first(); return cores.isEmpty() ? null : cores.first();
} }