diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index 152a823b88..7a537c1782 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -20,6 +20,7 @@ import mindustry.world.meta.*; import static mindustry.Vars.*; +@Deprecated public class ForceProjector extends Block{ public final int timerUse = timers++; public float phaseUseTime = 350f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java index 7867f17157..3c21c528fd 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java @@ -54,7 +54,7 @@ public class BaseTurret extends Block{ super.init(); if(acceptCoolant){ - coolantConsumer = findConsumer(c -> c instanceof ConsumeLiquidBase && c.booster); + coolantConsumer = findConsumer(c -> c instanceof ConsumeLiquidBase); } } diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java index 6e62af59ea..3d5ed7a133 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -5,7 +5,6 @@ import arc.util.*; import mindustry.entities.bullet.*; import mindustry.gen.*; import mindustry.type.*; -import mindustry.world.consumers.*; import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -19,7 +18,6 @@ public class LaserTurret extends PowerTurret{ public LaserTurret(String name){ super(name); - consume(new ConsumeCoolant(0.01f)).update(false); coolantMultiplier = 1f; } diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 23bcd6256d..6d3feb16e5 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -257,17 +257,15 @@ public class PowerGraph{ //there's something to update, add the entity entity.add(); - if(build.block.consPower != null){ - if(build.block.outputsPower && build.block.consumesPower && !build.block.consPower.buffered){ - producers.add(build); - consumers.add(build); - }else if(build.block.outputsPower && build.block.consumesPower){ - batteries.add(build); - }else if(build.block.outputsPower){ - producers.add(build); - }else if(build.block.consumesPower){ - consumers.add(build); - } + if(build.block.outputsPower && build.block.consumesPower && !build.block.consPower.buffered){ + producers.add(build); + consumers.add(build); + }else if(build.block.outputsPower && build.block.consumesPower){ + batteries.add(build); + }else if(build.block.outputsPower){ + producers.add(build); + }else if(build.block.consumesPower){ + consumers.add(build); } } }