Skip to content

Commit 1afcfbe

Browse files
author
slava0135
committed
fixes
1 parent ed1fa24 commit 1afcfbe

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

mod.hjson

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ displayName: "reVision"
33
author: "Slava0135"
44
main: "revision.ReVision"
55
description: "The other way around"
6-
version: "12.0"
6+
version: "12.1"
77
minGameVersion: 120
88

src/revision/world/blocks/defense/HackTurret.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import arc.util.io.Writes
1313
import mindustry.Vars
1414
import mindustry.entities.Units
1515
import mindustry.entities.Units.Sortf
16+
import mindustry.game.EventType
1617
import mindustry.gen.*
1718
import mindustry.gen.Unit
1819
import mindustry.graphics.Drawf
@@ -108,7 +109,7 @@ open class HackTurret(name: String) : BaseTurret(name) {
108109
target =
109110
Units.bestEnemy(
110111
team, x, y, range,
111-
{ e: Unit -> !e.dead() && (e.isGrounded || targetAir) && (!e.isGrounded || targetGround) && e !in targets },
112+
{ e: Unit -> !e.dead() && (e.isGrounded || targetAir) && (!e.isGrounded || targetGround) && !e.spawnedByCore && e !in targets },
112113
unitSort
113114
)
114115
target?.let {
@@ -128,6 +129,11 @@ open class HackTurret(name: String) : BaseTurret(name) {
128129
return !Units.invalidateTarget(target, team, x, y, range) && efficiency() > 0.02f
129130
}
130131

132+
override fun onRemoved() {
133+
targets.remove(target)
134+
super.onRemoved()
135+
}
136+
131137
override fun draw() {
132138
drawTurret()
133139
if (target != null) {

0 commit comments

Comments
 (0)