Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2023-06-21 23:55:05 -04:00
2 changed files with 5 additions and 1 deletions
+4
View File
@@ -65,6 +65,10 @@ public class UnitCommand{
return Icon.icons.get(icon, Icon.cancel); return Icon.icons.get(icon, Icon.cancel);
} }
public char getEmoji() {
return (char) Iconc.codes.get(icon, Iconc.cancel);
}
@Override @Override
public String toString(){ public String toString(){
return "UnitCommand:" + name; return "UnitCommand:" + name;
+1 -1
View File
@@ -408,7 +408,7 @@ public class Units{
if(team != null){ if(team != null){
team.data().tree().intersect(x, y, width, height, cons); team.data().tree().intersect(x, y, width, height, cons);
}else{ }else{
for(var other : state.teams.getActive()){ for(var other : state.teams.present){
other.tree().intersect(x, y, width, height, cons); other.tree().intersect(x, y, width, height, cons);
} }
} }