Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -65,6 +65,10 @@ public class UnitCommand{
|
||||
return Icon.icons.get(icon, Icon.cancel);
|
||||
}
|
||||
|
||||
public char getEmoji() {
|
||||
return (char) Iconc.codes.get(icon, Iconc.cancel);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(){
|
||||
return "UnitCommand:" + name;
|
||||
|
||||
@@ -408,7 +408,7 @@ public class Units{
|
||||
if(team != null){
|
||||
team.data().tree().intersect(x, y, width, height, cons);
|
||||
}else{
|
||||
for(var other : state.teams.getActive()){
|
||||
for(var other : state.teams.present){
|
||||
other.tree().intersect(x, y, width, height, cons);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user