Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -1181,7 +1181,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite Enemy Team Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
@@ -2322,7 +2321,7 @@ lenum.payenter = Enter/land on the payload block the unit is on.
 lenum.flag = Numeric unit flag.
 lenum.mine = Mine at a position.
 lenum.build = Build a structure.
-lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
+lenum.getblock = Fetch a building, floor and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
 

core/assets/bundles/bundle_be.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Бясконцыя рэсурсы ІІ (чырвоная каманда)
 rules.blockhealthmultiplier = Множнік здароўя блокаў
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Множнік хуткасці вытворчасці баёў. адз.
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Множнік здароўя баёў. адз.

core/assets/bundles/bundle_bg.properties

@@ -1171,7 +1171,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Безкрайни Ресурси за Ботът (Червеният Отбор)
 rules.blockhealthmultiplier = Множител на Точките Живот на Блокове
 rules.blockdamagemultiplier = Множител на Щетите на Блокове
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Множител на Скоростта на Производство на Единици
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Множител на Точките Живот на Единици

core/assets/bundles/bundle_ca.properties

@@ -1176,7 +1176,6 @@ rules.placerangecheck = Comprova l’abast de construcció
 rules.enemyCheat = Recursos infinits per a la IA (equip vermell)
 rules.blockhealthmultiplier = Multiplicador de la salut dels blocs
 rules.blockdamagemultiplier = Multiplicador del dany dels blocs
-rules.hideBannedBlocks = Amaga els blocs no permesos
 rules.unitbuildspeedmultiplier = Multiplicador de la velocitat de producció d’unitats
 rules.unitcostmultiplier = Multiplicador del cost de les unitats
 rules.unithealthmultiplier = Multiplicador de la salut de les unitats

core/assets/bundles/bundle_cs.properties

@@ -1173,7 +1173,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Neomezeně surovin pro umělou inteligenci
 rules.blockhealthmultiplier = Násobek zdraví bloků
 rules.blockdamagemultiplier = Násobek poškození bloků
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Násobek rychlosti výroby jednotek
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Násobek zdraví jednotek

core/assets/bundles/bundle_da.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Uendelig AI (rødt hold) resurser.
 rules.blockhealthmultiplier = Blok-helbreds-forstærker.
 rules.blockdamagemultiplier = Blok-skade-forstærker.
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Enheds-produktionshastigheds-forstærker
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Enheds-helbreds-forstærker

core/assets/bundles/bundle_de.properties

@@ -1176,7 +1176,6 @@ rules.placerangecheck = Platzierungsweitenkontrolle
 rules.enemyCheat = Unbegrenzte Ressourcen für die KI (Rotes Team)
 rules.blockhealthmultiplier = Block-Lebenspunkte-Multiplikator
 rules.blockdamagemultiplier = Block-Schaden-Multiplikator
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Einheiten-Baugeschwindigkeit Multiplikator
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Einheit-Lebenspunkte-Multiplikator

core/assets/bundles/bundle_es.properties

@@ -1182,7 +1182,6 @@ rules.placerangecheck = Comprobar rango de construcción
 rules.enemyCheat = La IA (Equipo Rojo) tiene recursos infinitos
 rules.blockhealthmultiplier = Multiplicador de vida de estructuras
 rules.blockdamagemultiplier = Multiplicador de daño de estructuras
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Multiplicador de velocidad de producción de unidades
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Multiplicador de vida de unidades

core/assets/bundles/bundle_et.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = [scarlet]Vaenlastel[] on lõputult ressursse
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Väeüksuste tootmiskiiruse kordaja
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Väeüksuste elude kordaja

core/assets/bundles/bundle_eu.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = IA-k (talde gorriak) baliabide amaigabeak ditu
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Unitateen sorrerarako abiadura-biderkatzailea
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unitateen osasun-biderkatzailea

core/assets/bundles/bundle_fi.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Tarkista asetuskantama
 rules.enemyCheat = Loputtomat AI:n (punaisen joukkueen) resurssit
 rules.blockhealthmultiplier = Palikkojen elämäpistekerroin
 rules.blockdamagemultiplier = Palikkojen vahinkokerroin
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Yksikköjen tuotantonopeuskerroin
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Yksikköjen elämäpistekerroin

core/assets/bundles/bundle_fil.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier

core/assets/bundles/bundle_fr.properties

@@ -1181,7 +1181,6 @@ rules.placerangecheck = Vérification de la Portée de Placement
 rules.enemyCheat = Ressources infinies pour l'IA (équipe rouge)
 rules.blockhealthmultiplier = Multiplicateur de Santé des Blocs
 rules.blockdamagemultiplier = Multiplicateur de Dégât des Blocs
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Multiplicateur de Vitesse de Construction des Unités
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Multiplicateur de Santé des Unités

core/assets/bundles/bundle_hu.properties

@@ -1170,7 +1170,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Végtelen AI (Piros csapat) Erőforrás
 rules.blockhealthmultiplier = Épület életpont szorzó
 rules.blockdamagemultiplier = Épület sebzés szorzó
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Egység gyártási sebesség szorzó
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Egység életpont szorzó

core/assets/bundles/bundle_id_ID.properties

@@ -1181,7 +1181,6 @@ rules.placerangecheck = Pemeriksaan Rentang Penempatan
 rules.enemyCheat = Sumber Daya A.I. (Tim Merah) Tak Terbatas
 rules.blockhealthmultiplier = Penggandaan Darah Blok
 rules.blockdamagemultiplier = Penggandaan Kekuatan Blok
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Penggandaan Kecepatan Munculnya Unit
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Penggandaan Darah Unit

core/assets/bundles/bundle_it.properties

@@ -1168,7 +1168,6 @@ rules.placerangecheck = Protezione del nucleo dalle costruzioni nemiche
 rules.enemyCheat = Risorse AI (squadra Rossa) Infinite
 rules.blockhealthmultiplier = Moltiplicatore Salute Blocco
 rules.blockdamagemultiplier = Moltiplicatore Danno Blocco
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Moltiplicatore Velocità Costruzione Unità
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Moltiplicatore Vita Unità

core/assets/bundles/bundle_ja.properties

@@ -1173,7 +1173,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = 敵(赤チーム)の資源の無限化
 rules.blockhealthmultiplier = ブロックの体力倍率
 rules.blockdamagemultiplier = ブロックのダメージ倍率
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = ユニットの製造速度倍率
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = ユニットの体力倍率

core/assets/bundles/bundle_ko.properties

@@ -1174,7 +1174,6 @@ rules.placerangecheck = 배치 거리 확인
 rules.enemyCheat = 적 AI 무한자원
 rules.blockhealthmultiplier = 블록 체력 배수
 rules.blockdamagemultiplier = 블록 피해량 배수
-rules.hideBannedBlocks = 금지된 블록 숨기기
 rules.unitbuildspeedmultiplier = 기체 생산속도 배수
 rules.unitcostmultiplier = 기체 비용 배수
 rules.unithealthmultiplier = 기체 체력 배수

core/assets/bundles/bundle_lt.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Neriboti Kompiuterio (Raudonosios Komandos) Resursai
 rules.blockhealthmultiplier = Blokų Gyvybių Daugiklis
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Vienetų Gamybos Greičio Daugiklis
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Vienetų Gyvybių Daugiklis

core/assets/bundles/bundle_nl.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Oneindige AI grondstoffen
 rules.blockhealthmultiplier = Blok Health Vermenigvulder
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Unit Spawn Snelheid Vermenigvulder
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Vermenigvulder

core/assets/bundles/bundle_nl_BE.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier

core/assets/bundles/bundle_pl.properties

@@ -1172,7 +1172,6 @@ rules.placerangecheck = Sprawdzanie Zasięgu Podczas Umieszczenia
 rules.enemyCheat = Nieskończone Zasoby SI (wroga)
 rules.blockhealthmultiplier = Mnożnik Życia Bloków
 rules.blockdamagemultiplier = Mnożnik Uszkodzeń Bloków
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Mnożnik Prędkości Tworzenia Jednostek
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Mnożnik Życia Jednostek

core/assets/bundles/bundle_pt_BR.properties

@@ -1183,7 +1183,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Recursos de IA Infinitos
 rules.blockhealthmultiplier = Multiplicador de vida do bloco
 rules.blockdamagemultiplier = Multiplicador de dano do bloco
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Multiplicador de vida de unidade

core/assets/bundles/bundle_pt_PT.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Recursos de IA Infinitos
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Multiplicador de vida de unidade

core/assets/bundles/bundle_ro.properties

@@ -1173,7 +1173,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Resurse infinite pt AI (echipa roșie)
 rules.blockhealthmultiplier = Multiplicatorul Vieții Blocurilor
 rules.blockdamagemultiplier = Multiplicatorul Deteriorării Blocurilor
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Multiplicatorul Vitezei de Producere a Unităților
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Multiplicatorul Vieții Unităților

core/assets/bundles/bundle_ru.properties

@@ -1172,7 +1172,6 @@ rules.placerangecheck = Проверка диапазона размещения
 rules.enemyCheat = Бесконечные ресурсы ИИ (красная команда)
 rules.blockhealthmultiplier = Множитель прочности блоков
 rules.blockdamagemultiplier = Множитель урона блоков
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Множитель скорости производства боев. ед.
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Множитель прочности боев. ед.

core/assets/bundles/bundle_sr.properties

@@ -1173,7 +1173,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Beskonačnost Neprijateljskih Resursa
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Sakrij Nedozvoljena Sredstva
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier

core/assets/bundles/bundle_sv.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier

core/assets/bundles/bundle_th.properties

@@ -1174,7 +1174,6 @@ rules.placerangecheck = ตรวจสอบระยะห่างการ
 rules.enemyCheat = AI (ทีมสีแดง) มีทรัพยากรไม่จำกัด
 rules.blockhealthmultiplier = พหุคูณพลังชีวิตของบล็อก
 rules.blockdamagemultiplier = พหุคูณดาเมจของบล็อก
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = พหุคูณความเร็วในการสร้างยูนิต
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = พหุคูณพลังชีวิตของยูนิต

core/assets/bundles/bundle_tk.properties

@@ -1161,7 +1161,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Infinite AI Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier

core/assets/bundles/bundle_tr.properties

@@ -1173,7 +1173,6 @@ rules.placerangecheck = İnşa Menzilini Doğrula
 rules.enemyCheat = Sonsuz AI (Kırmızı Takım) Kaynakları
 rules.blockhealthmultiplier = Blok Canı Çarpanı
 rules.blockdamagemultiplier = Blok Hasarı Çarpanı
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Birim Üretim Hızı Çarpanı
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Birim Canı Çarpanı

core/assets/bundles/bundle_uk_UA.properties

@@ -1179,7 +1179,6 @@ rules.placerangecheck = Перевірка діапазону розміщенн
 rules.enemyCheat = Нескінченні ресурси для червоної команди ШІ
 rules.blockhealthmultiplier = Множник здоров’я блоків
 rules.blockdamagemultiplier = Множник шкоди блоків
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойових одиниць
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Множник здоров’я бойових одиниць

core/assets/bundles/bundle_vi.properties

@@ -1173,7 +1173,6 @@ rules.placerangecheck = Placement Range Check
 rules.enemyCheat = Tài nguyên vô hạn (kẻ địch)
 rules.blockhealthmultiplier = Hệ số độ bền khối
 rules.blockdamagemultiplier = Hệ số sát thương của khối
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = Hệ số tốc độ sản xuất lính
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Hệ số máu của quân lính

core/assets/bundles/bundle_zh_CN.properties

@@ -1174,7 +1174,6 @@ rules.placerangecheck = 敌对建筑周围禁建
 rules.enemyCheat = 敌人（红队）无限资源
 rules.blockhealthmultiplier = 建筑生命倍率
 rules.blockdamagemultiplier = 建筑伤害倍率
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = 单位生产速度倍率
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = 单位生命倍率

core/assets/bundles/bundle_zh_TW.properties

@@ -1181,7 +1181,6 @@ rules.placerangecheck = 檢查放置範圍
 rules.enemyCheat = 電腦無限資源
 rules.blockhealthmultiplier = 建築物耐久度加成
 rules.blockdamagemultiplier = 建築物傷害加成
-rules.hideBannedBlocks = Hide Banned Blocks
 rules.unitbuildspeedmultiplier = 單位建設速度加成
 rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = 單位血量加成

core/src/mindustry/logic/LExecutor.java

@@ -510,12 +510,21 @@ public class LExecutor{
                         if(!unit.within(x1, y1, range)){
                             exec.setobj(p3, null);
                             exec.setobj(p4, null);
+                            exec.setobj(p5, null);
                         }else{
                             Tile tile = world.tileWorld(x1, y1);
-                            //any environmental solid block is returned as StoneWall, aka "@solid"
+                            if(tile == null){
-                            Block block = tile == null ? null : !tile.synthetic() ? (tile.solid() ? Blocks.stoneWall : Blocks.air) : tile.block();
+                                exec.setobj(p3, null);
-                            exec.setobj(p3, block);
+                                exec.setobj(p4, null);
-                            exec.setobj(p4, tile != null && tile.build != null ? tile.build : null);
+                                exec.setobj(p5, null);
+                            }else{
+                                //any environmental solid block is returned as StoneWall, aka "@solid"
+                                Block block = !tile.synthetic() ? (tile.solid() ? Blocks.stoneWall : Blocks.air) : tile.block();
+                                exec.setobj(p3, block);
+                                exec.setobj(p4, tile.build != null ? tile.build : null);
+                                //Allows reading of ore tiles if they are present (overlay is not air) otherwise returns the floor
+                                exec.setobj(p5, tile.overlay() == Blocks.air ? tile.floor() : tile.overlay());
+                            }
                         }
                     }
                     case itemDrop -> {

core/src/mindustry/logic/LUnitControl.java

@@ -16,7 +16,7 @@ public enum LUnitControl{
     mine("x", "y"),
     flag("value"),
     build("x", "y", "block", "rotation", "config"),
-    getBlock("x", "y", "type", "building"),
+    getBlock("x", "y", "type", "building", "floor"),
     within("x", "y", "radius", "result"),
     unbind;
 

core/src/mindustry/net/WorldReloader.java

@@ -32,7 +32,9 @@ public class WorldReloader{
 
             Call.worldDataBegin();
         }else{
-            net.reset();
+            if(net.client()){
+                net.reset();
+            }    
             logic.reset();
         }
 

core/src/mindustry/world/blocks/power/PowerDiode.java

@@ -56,7 +56,7 @@ public class PowerDiode extends Block{
         public void updateTile(){
             super.updateTile();
 
-            if(tile == null || front() == null || back() == null || !back().block.hasPower || !front().block.hasPower || back().team != front().team) return;
+            if(tile == null || front() == null || back() == null || !back().block.hasPower || !front().block.hasPower || back().team != team || front().team != team) return;
 
             PowerGraph backGraph = back().power.graph;
             PowerGraph frontGraph = front().power.graph;

core/src/mindustry/world/blocks/production/Drill.java

@@ -50,6 +50,8 @@ public class Drill extends Block{
     public Effect drillEffect = Fx.mine;
     /** Drill effect randomness. Block size by default. */
     public float drillEffectRnd = -1f;
+    /** Chance of displaying the effect. Useful for extremely fast drills. */
+    public float drillEffectChance = 1f;
     /** Speed the drill bit rotates at. */
     public float rotateSpeed = 2f;
     /** Effect randomly played while drilling. */
@@ -306,7 +308,7 @@ public class Drill extends Block{
 
                 progress %= delay;
 
-                if(wasVisible) drillEffect.at(x + Mathf.range(drillEffectRnd), y + Mathf.range(drillEffectRnd), dominantItem.color);
+                if(wasVisible && Mathf.chanceDelta(updateEffectChance * warmup)) drillEffect.at(x + Mathf.range(drillEffectRnd), y + Mathf.range(drillEffectRnd), dominantItem.color);
             }
         }