From fbc67406686e96c37528949925bcb9590947fa5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D0=BA=D0=BD=D0=B5=D1=81=D1=81=233729?=
 <79508138+Darkness6030@users.noreply.github.com>
Date: Wed, 21 Jun 2023 16:05:39 +0300
Subject: [PATCH 1/2] fix (#8736)

---
 core/src/mindustry/entities/Units.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index 1a5d024b1c..184203a9b7 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -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);
             }
         }

From 2d827f83b49b55e6dc3ff15396083035e44755a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D0=BA=D0=BD=D0=B5=D1=81=D1=81=233729?=
 <79508138+Darkness6030@users.noreply.github.com>
Date: Wed, 21 Jun 2023 23:28:25 +0300
Subject: [PATCH 2/2] add getEmoji() method (#8739)

---
 core/src/mindustry/ai/UnitCommand.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/mindustry/ai/UnitCommand.java b/core/src/mindustry/ai/UnitCommand.java
index 0cc864fd83..20cec778bd 100644
--- a/core/src/mindustry/ai/UnitCommand.java
+++ b/core/src/mindustry/ai/UnitCommand.java
@@ -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;