From 55dfffa4bc2752b2fd5e349d0e2135f13d538448 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Aug 2024 04:00:18 -0400 Subject: [PATCH] Hide internal units from logic --- core/src/mindustry/logic/GlobalVars.java | 4 +++- core/src/mindustry/logic/LExecutor.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java index 3b954d986d..4832be2ce8 100644 --- a/core/src/mindustry/logic/GlobalVars.java +++ b/core/src/mindustry/logic/GlobalVars.java @@ -132,7 +132,9 @@ public class GlobalVars{ } for(UnitType type : Vars.content.units()){ - put("@" + type.name, type); + if(!type.internal){ + put("@" + type.name, type); + } } for(Weather weather : Vars.content.weathers()){ diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index f9930a610b..c9fdbef37d 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -1380,7 +1380,7 @@ public class LExecutor{ Team t = team.team(); - if(type.obj() instanceof UnitType type && !type.hidden && t != null && Units.canCreate(t, type)){ + if(type.obj() instanceof UnitType type && !type.internal && !type.hidden && t != null && Units.canCreate(t, type)){ //random offset to prevent stacking var unit = type.spawn(t, World.unconv(x.numf()) + Mathf.range(0.01f), World.unconv(y.numf()) + Mathf.range(0.01f)); spawner.spawnEffect(unit, rotation.numf());