From c35dde5569db62c336e24b253376e79234bf0cb0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 15 Aug 2021 21:17:16 -0400 Subject: [PATCH] Fixed #5772 --- core/src/mindustry/world/Block.java | 10 ++++++++-- .../src/mindustry/world/blocks/campaign/LaunchPad.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index a68376aac8..d6e7605f76 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -36,8 +36,11 @@ import java.util.*; import static mindustry.Vars.*; public class Block extends UnlockableContent{ + /** If true, buildings have an ItemModule. */ public boolean hasItems; + /** If true, buildings have a LiquidModule. */ public boolean hasLiquids; + /** If true, buildings have a PowerModule. */ public boolean hasPower; public boolean outputsLiquid = false; @@ -45,8 +48,6 @@ public class Block extends UnlockableContent{ public boolean outputsPower = false; public boolean outputsPayload = false; public boolean acceptsPayload = false; - public boolean outputFacing = true; - public boolean noSideBlend = false; public boolean acceptsItems = false; public int itemCapacity = 10; @@ -56,6 +57,11 @@ public class Block extends UnlockableContent{ public final BlockBars bars = new BlockBars(); public final Consumers consumes = new Consumers(); + /** If true, this block outputs to its facing direction, when applicable. + * Used for blending calculations. */ + public boolean outputFacing = true; + /** if true, this block does not accept input from the sides (used for armored conveyors) */ + public boolean noSideBlend = false; /** whether to display flow rate */ public boolean displayFlow = true; /** whether this block is visible in the editor */ diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java index 12bcb762b3..0c09a21a9e 100644 --- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java +++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java @@ -122,7 +122,7 @@ public class LaunchPad extends Block{ if(!state.isCampaign()) return; //increment launchCounter then launch when full and base conditions are met - if((launchCounter += edelta()) >= launchTime && items.total() >= itemCapacity){ + if((launchCounter += edelta()) >= launchTime && edelta() >= 0.001f && items.total() >= itemCapacity){ launchSound.at(x, y); LaunchPayload entity = LaunchPayload.create(); items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount)));