Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2021-03-30 20:58:20 -04:00
commit 179cedd6cc

View File

@ -5,7 +5,7 @@ import mindustry.gen.*;
public enum RadarTarget{
any((team, other) -> true),
enemy((team, other) -> team != other.team),
enemy((team, other) -> team != other.team && other.team != Team.derelict),
ally((team, other) -> team == other.team),
player((team, other) -> other.isPlayer()),
attacker((pos, other) -> other.canShoot()),