From d85f6c72ebdbf71e02857d1a8e045bbbf4f736c2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 11 Aug 2020 11:18:32 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/game/Team.java | 3 +-- core/src/mindustry/game/Teams.java | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index a7585863b3..3028edf3f4 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -91,8 +91,7 @@ public class Team implements Comparable{ return state.teams.get(this); } - public @Nullable - CoreBuild core(){ + public @Nullable CoreBuild core(){ return data().core(); } diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index df11016684..ad6915134e 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -21,8 +21,7 @@ public class Teams{ active.add(get(Team.crux)); } - public @Nullable - CoreBuild closestEnemyCore(float x, float y, Team team){ + public @Nullable CoreBuild closestEnemyCore(float x, float y, Team team){ for(Team enemy : team.enemies()){ CoreBuild tile = Geometry.findClosest(x, y, enemy.cores()); if(tile != null) return tile; @@ -30,8 +29,7 @@ public class Teams{ return null; } - public @Nullable - CoreBuild closestCore(float x, float y, Team team){ + public @Nullable CoreBuild closestCore(float x, float y, Team team){ return Geometry.findClosest(x, y, get(team).cores); } @@ -168,8 +166,7 @@ public class Teams{ return cores.isEmpty(); } - public @Nullable - CoreBuild core(){ + public @Nullable CoreBuild core(){ return cores.isEmpty() ? null : cores.first(); }