From 920491ddb25449c381b6c06ea6f7a09ce32c5bb2 Mon Sep 17 00:00:00 2001 From: Timmeey86 Date: Wed, 21 Nov 2018 23:38:28 +0100 Subject: [PATCH] MassDriver now properly displays the power per shot --- .../mindustry/world/blocks/distribution/MassDriver.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index ea15719524..f81c344278 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -61,6 +61,7 @@ public class MassDriver extends Block{ layer = Layer.turret; hasPower = true; consumes.powerBuffered(30f); + consumes.require(ConsumePower.class); } @Remote(targets = Loc.both, called = Loc.server, forward = true) @@ -131,10 +132,7 @@ public class MassDriver extends Block{ public void setStats(){ super.setStats(); - if(!consumes.has(ConsumePower.class) || !consumes.get(ConsumePower.class).isBuffered){ - throw new RuntimeException("Mass Driver did not have a buffered power consumer object attached."); - } - stats.add(BlockStat.powerShot, consumes.get(ConsumePower.class).powerCapacity, StatUnit.powerUnits); + stats.add(BlockStat.powerShot, consumes.get(ConsumePower.class).powerCapacity * powerPercentageUsed, StatUnit.powerUnits); } @Override