diff --git a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java index 576354e7c9..1bd906dfcc 100644 --- a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java +++ b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java @@ -26,7 +26,7 @@ public class EnergyFieldAbility extends Ability{ public Sound shootSound = Sounds.spark; public float statusDuration = 60f * 6f; public float x, y; - public boolean hitBuildings = true; + public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true; public int maxTargets = 25; public float healPercent = 2.5f; @@ -99,13 +99,15 @@ public class EnergyFieldAbility extends Ability{ all.clear(); - Units.nearby(null, rx, ry, range, other -> { - if(other != unit){ - all.add(other); - } - }); + if(hitUnits){ + Units.nearby(null, rx, ry, range, other -> { + if(other != unit && (other.isFlying() ? targetAir : targetGround)){ + all.add(other); + } + }); + } - if(hitBuildings){ + if(hitBuildings && targetGround){ Units.nearbyBuildings(rx, ry, range, b -> { if(b.team != Team.derelict || state.rules.coreCapture){ all.add(b); diff --git a/servers_v7.json b/servers_v7.json index 3fedf64b61..98765e821d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -37,7 +37,7 @@ }, { "name": "io", - "address": ["mindustry.io.community", "mindustry.io.community:1000", "mindustry.io.community:2000", "mindustry.io.community:3000", "mindustry.io.community:4000", "mindustry.io.community:5000"] + "address": ["mindustry.io.community", "mindustry.io.community:1000", "mindustry.io.community:2000", "mindustry.io.community:3000", "mindustry.io.community:4000", "labs.io.community"] }, { "name": "Korea",