Fix proc highlight triggering when hiding units / hiding air units

mindustry-antigrief · Dec 24, 2023 · 77cedfe · 77cedfe
1 parent b630b8a
commit 77cedfe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java
@@ -271,7 +271,7 @@ public void drawTop(){
 
         input.drawOverSelect();
 
-        if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller != null && ai.controller.isValid()){
+        if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller != null && ai.controller.isValid() && !hidingUnits && !(hidingAirUnits && unit.isFlying())){
             var build = ai.controller;
             Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f);
             if (Core.settings.getBool("tracelogicunits")) build.drawSelect();

diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -642,7 +642,7 @@ public void drawConfigure(){
 
         @Override
         public void drawSelect(){
-            Groups.unit.each(u -> u.controller() instanceof LogicAI ai && ai.controller == this, unit -> {
+            Groups.unit.each(u -> u.controller() instanceof LogicAI ai && ai.controller == this && !ClientVars.hidingUnits && !(ClientVars.hidingAirUnits && u.isFlying()), unit -> {
                 Drawf.square(unit.x, unit.y, unit.hitSize, unit.rotation + 45);
                 if (Core.settings.getBool("tracelogicunits")) {
                     Draw.draw((float) (Layer.overlayUI+0.01), () -> { // Taken from extended-UI