From 47dc9c7b313a9ea43b332d0dceca1a65343ec9c7 Mon Sep 17 00:00:00 2001 From: JrTRinny <85090668+JrTRinny@users.noreply.github.com> Date: Sat, 18 Sep 2021 20:52:31 +0700 Subject: [PATCH] add playerControllable for turrets (#6019) --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 050e20975a..99412528dc 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -66,6 +66,7 @@ public class Turret extends ReloadTurret{ public boolean targetAir = true; public boolean targetGround = true; public boolean targetHealing = false; + public boolean playerControllable = true; //charging public float chargeTime = -1f; @@ -157,6 +158,11 @@ public class Turret extends ReloadTurret{ unit.tile(this); } + @Override + public boolean canControl(){ + return playerControllable; + } + @Override public void control(LAccess type, double p1, double p2, double p3, double p4){ if(type == LAccess.shoot && (unit == null || !unit.isPlayer())){