Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -1482,6 +1482,7 @@ rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_be.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Множнік здароўя баяв. адз.
 rules.unitdamagemultiplier = Множнік страт баяв. адз.
 rules.unitcrashdamagemultiplier = Множнік Падрыўнога Пашкоджання Юніта
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Множнік Сонечнай Энергіі

core/assets/bundles/bundle_bg.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Множител на точките живот н
 rules.unitdamagemultiplier = Множител на щетите на единици
 rules.unitcrashdamagemultiplier = Множител на вредата от разбиващи се единици
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Множител на слънчевата енергия

core/assets/bundles/bundle_ca.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Multiplicador de la salut de les unitats
 rules.unitdamagemultiplier = Multiplicador del dany de les unitats
 rules.unitcrashdamagemultiplier = Multiplicador del dany de xoc de les unitats
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Multiplicador de l’energia solar

core/assets/bundles/bundle_cs.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Násobek zdraví jednotek
 rules.unitdamagemultiplier = Násobek poškození jednotkami
 rules.unitcrashdamagemultiplier = Násobek poškození při nárazu jednotky
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Násobek Solární Energie

core/assets/bundles/bundle_da.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Enheds-helbreds-forstærker
 rules.unitdamagemultiplier = Enheds-skade-forstærker
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_de.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Einheit-Lebenspunkte-Multiplikator
 rules.unitdamagemultiplier = Einheit-Schaden-Multiplikator
 rules.unitcrashdamagemultiplier = Einheiten-Absturzschaden-Multiplikator
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solarstrom-Multiplikator

core/assets/bundles/bundle_es.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Multiplicador de vida de unidades
 rules.unitdamagemultiplier = Multiplicador de daño de unidades
 rules.unitcrashdamagemultiplier = Multiplicador de daño de colisión de unidades
 rules.unitminespeedmultiplier = Multiplicador de velocidad de mineria de unidades
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Multiplicador de energía solar

core/assets/bundles/bundle_et.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Väeüksuste elude kordaja
 rules.unitdamagemultiplier = Väeüksuste hävitusvõime kordaja
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_eu.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Unitateen osasun-biderkatzailea
 rules.unitdamagemultiplier = Unitateen kalte-biderkatzailea
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_fi.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Yksikköjen elämäpistekerroin
 rules.unitdamagemultiplier = Yksikköjen vahinkokerroin
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Aurinkovoimakerroin

core/assets/bundles/bundle_fil.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_fr.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Multiplicateur de Santé des Unités
 rules.unitdamagemultiplier = Multiplicateur de Dégât des Unités
 rules.unitcrashdamagemultiplier = Multiplicateur de Dégât de chute des Unités
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Multiplicateur de l'Efficacité des Panneaux Solaires

core/assets/bundles/bundle_hu.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Egységek életpontszorzója
 rules.unitdamagemultiplier = Egységek sebzésszorzója
 rules.unitcrashdamagemultiplier = Egységek ütközési sebzésszorzója
 rules.unitminespeedmultiplier = Egységek bányászási sebességszorzója
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Egységépítő logika
 rules.logicunitdeconstruct = Egységlebontó logika
 rules.solarmultiplier = Napenergia szorzója

core/assets/bundles/bundle_id_ID.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Penggandaan Nyawa Unit
 rules.unitdamagemultiplier = Penggandaan Damage Unit
 rules.unitcrashdamagemultiplier = Penggandaan Damage Jatuhnya Unit
 rules.unitminespeedmultiplier = Penggandaan Kecepatan Unit Menambang
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Penggandaan Tenaga Surya

core/assets/bundles/bundle_it.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Moltiplicatore Vita Unità
 rules.unitdamagemultiplier = Moltiplicatore Danno Unità
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Moltiplicatore energia solare

core/assets/bundles/bundle_ja.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = ユニット体力倍率
 rules.unitdamagemultiplier = ユニットダメージ倍率
 rules.unitcrashdamagemultiplier = ユニット衝突ダメージ倍率
 rules.unitminespeedmultiplier = ユニット採掘速度倍率
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = 太陽光の倍率

core/assets/bundles/bundle_ko.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = 유닛 체력 배수
 rules.unitdamagemultiplier = 유닛 피해량 배수
 rules.unitcrashdamagemultiplier = 유닛 충돌 피해량 배수
 rules.unitminespeedmultiplier = 유닛 채굴 속도 배수
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = 로직: 유닛 건설 허용
 rules.logicunitdeconstruct = 로직: 유닛 철거 허용
 rules.solarmultiplier = 태양광 전력 배수

core/assets/bundles/bundle_lt.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Vienetų Gyvybių Daugiklis
 rules.unitdamagemultiplier = Vienetų Žalos Daugiklis
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_nl.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Eenheid Levenspunten Vermenigvuldiger
 rules.unitdamagemultiplier = Eenheid Schade Vermenigvuldiger
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Zonne-Energie Vermenigvuldiger

core/assets/bundles/bundle_nl_BE.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_pl.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Mnożnik Życia Jednostek
 rules.unitdamagemultiplier = Mnożnik Obrażeń jednostek
 rules.unitcrashdamagemultiplier = Obrażenia Zadawane Po Zniszczeniu
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Mnożnik Mocy Paneli Słonecznych

core/assets/bundles/bundle_pt_BR.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Multiplicador de vida de unidade
 rules.unitdamagemultiplier = Multiplicador de dano de Unidade
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Multiplicador de Energia Solar

core/assets/bundles/bundle_pt_PT.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Multiplicador de Vida de Unidades
 rules.unitdamagemultiplier = Multiplicador de Dano de Unidades
 rules.unitcrashdamagemultiplier = Multiplicador de Dano de Unidades quando Destruídas.
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Multiplicador de Energia Solar

core/assets/bundles/bundle_ro.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Multiplicatorul Vieții Unităților
 rules.unitdamagemultiplier = Multiplicatorul Deteriorării Unităților
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_ru.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Множитель прочности боев. е
 rules.unitdamagemultiplier = Множитель урона боев. ед.
 rules.unitcrashdamagemultiplier = Множитель урона от падения боев. ед.
 rules.unitminespeedmultiplier = Множитель скорости копания боев. ед.
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Множитель солнечной энергии

core/assets/bundles/bundle_sr.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_sv.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_th.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = พหุคูณพลังชีวิตขอ
 rules.unitdamagemultiplier = พหุคูณพลังโจมตีของยูนิต
 rules.unitcrashdamagemultiplier = พหูคูณดาเมจการตกของยานยูนิต
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = พหูคุณพลังงานแสงอาทิตย์

core/assets/bundles/bundle_tk.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Solar Power Multiplier

core/assets/bundles/bundle_tr.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Birim Can Çarpanı
 rules.unitdamagemultiplier = Birim Hasar Çapanı
 rules.unitcrashdamagemultiplier = Birim Çakılma Hasar Çarpanı
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Güneş Paneli Üretim Çarpanı

core/assets/bundles/bundle_uk_UA.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Множник здоров’я бойових о
 rules.unitdamagemultiplier = Множник шкоди бойових одиниць
 rules.unitcrashdamagemultiplier = Множник шкоди одиниці при зіткненні одиниць
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = Множник сонячної енергії

core/assets/bundles/bundle_vi.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = Hệ Số Độ Bền Của Đơn Vị
 rules.unitdamagemultiplier = Hệ Số Sát Thương Của Đơn Vị
 rules.unitcrashdamagemultiplier = Hệ Số Sát Thương Của Đơn Vị Khi Bị Bắn Rơi
 rules.unitminespeedmultiplier = Hệ Số Tốc Độ Khai Khoáng Đơn Vị
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Đơn Vị Xây Dựng
 rules.logicunitdeconstruct = Logic Đơn Vị Phá Dỡ
 rules.solarmultiplier = Hệ Số Năng Lượng Mặt Trời

core/assets/bundles/bundle_zh_CN.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = 单位生命倍率
 rules.unitdamagemultiplier = 单位伤害倍率
 rules.unitcrashdamagemultiplier = 单位坠毁伤害倍率
 rules.unitminespeedmultiplier = 单位采矿速度倍率
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = 太阳能发电倍率

core/assets/bundles/bundle_zh_TW.properties

@@ -1479,6 +1479,7 @@ rules.unithealthmultiplier = 單位血量加成
 rules.unitdamagemultiplier = 單位傷害加成
 rules.unitcrashdamagemultiplier = 單位墜毀傷害倍率
 rules.unitminespeedmultiplier = Unit Mine Speed Multiplier
+rules.logicunitcontrol = Logic Unit Control
 rules.logicunitbuild = Logic Unit Building
 rules.logicunitdeconstruct = Logic Unit Deconstruction
 rules.solarmultiplier = 太陽能電加成

core/src/mindustry/game/Rules.java

@@ -90,6 +90,8 @@ public class Rules{
     public float unitMineSpeedMultiplier = 1f;
     /** If true, ghost blocks will appear upon destruction, letting builder blocks/units rebuild them. */
     public boolean ghostBlocks = true;
+    /** Whether to allow logic to control units. */
+    public boolean logicUnitControl = true;
     /** Whether to allow units to build with logic. */
     public boolean logicUnitBuild = true;
     /** Whether to allow units to deconstruct blocks with logic. */

core/src/mindustry/logic/LExecutor.java

@@ -168,6 +168,8 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
+            if(!exec.privileged && !state.rules.logicUnitControl) return;
+
             if(exec.binds == null || exec.binds.length != content.units().size){
                 exec.binds = new int[content.units().size];
             }
@@ -219,6 +221,8 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
+            if(!exec.privileged && !state.rules.logicUnitControl) return;
+
             Object unitObj = exec.unit.obj();
             LogicAI ai = UnitControlI.checkLogicAI(exec, unitObj);
 
@@ -329,6 +333,8 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
+            if(!exec.privileged && !state.rules.logicUnitControl) return;
+
             Object unitObj = exec.unit.obj();
             LogicAI ai = checkLogicAI(exec, unitObj);
 

core/src/mindustry/logic/LogicDialog.java

@@ -300,7 +300,8 @@ public class LogicDialog extends BaseDialog{
                     for(Prov<LStatement> prov : LogicIO.allStatements){
                         LStatement example = prov.get();
                         if(example instanceof InvalidStatement || example.hidden() || (example.privileged() && !privileged) || (example.nonPrivileged() && privileged) ||
-                            (!text.isEmpty() && !example.name().toLowerCase(Locale.ROOT).contains(text) && !example.typeName().toLowerCase(Locale.ROOT).contains(text))) continue;
+                            (!text.isEmpty() && !example.name().toLowerCase(Locale.ROOT).contains(text) && !example.typeName().toLowerCase(Locale.ROOT).contains(text)) ||
+                            (!privileged && !state.rules.logicUnitControl && example.category() == LCategory.unit)) continue;
 
                         if(matched[0] == null){
                             matched[0] = prov;

core/src/mindustry/ui/dialogs/CustomRulesDialog.java

@@ -199,8 +199,9 @@ public class CustomRulesDialog extends BaseDialog{
         number("@rules.unitminespeedmultiplier", f -> rules.unitMineSpeedMultiplier = f, () -> rules.unitMineSpeedMultiplier);
         number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0f, 50f);
         number("@rules.unitcostmultiplier", f -> rules.unitCostMultiplier = f, () -> rules.unitCostMultiplier);
-        check("@rules.logicunitbuild", b -> rules.logicUnitBuild = b, () -> rules.logicUnitBuild);
+        check("@rules.logicunitcontrol", b -> rules.logicUnitControl = b, () -> rules.logicUnitControl);
-        check("@rules.logicunitdeconstruct", b -> rules.logicUnitDeconstruct = b, () -> rules.logicUnitDeconstruct);
+        check("@rules.logicunitbuild", b -> rules.logicUnitBuild = b, () -> rules.logicUnitBuild, () -> rules.logicUnitControl);
+        check("@rules.logicunitdeconstruct", b -> rules.logicUnitDeconstruct = b, () -> rules.logicUnitDeconstruct, () -> rules.logicUnitControl);
 
         if(Core.bundle.get("bannedunits").toLowerCase().contains(ruleSearch)){
             current.button("@bannedunits", () -> bannedUnits.show(rules.bannedUnits)).left().width(300f).row();

core/src/mindustry/world/blocks/logic/LogicBlock.java

@@ -523,8 +523,6 @@ public class LogicBlock extends Block{
             if(state.rules.disableWorldProcessors && privileged) return;
 
             if(enabled && executor.initialized()){
-                accumulator += edelta() * ipt;
-
                 if(accumulator > maxInstructionScale * ipt) accumulator = maxInstructionScale * ipt;
 
                 while(accumulator >= 1f){
@@ -535,6 +533,10 @@ public class LogicBlock extends Block{
                     }
                     accumulator --;
                 }
+
+                // Do not move in front of the loop, otherwise the curTime accumulated in WaitI
+                // may get out of sync with the accumulator increase.
+                accumulator += edelta() * ipt;
             }
         }