From 9da25c010a4791230daeb2f39e6987ef0dfd9181 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Fri, 24 Sep 2021 05:28:59 +0000 Subject: [PATCH] Fix ignition issues when block launch time is less than 0. --- Meteo_Engine.jar | Bin 13357 -> 13369 bytes src/sig/Board.java | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index a0676b918106f97feaeb329a56d1b248de093fd7..a6f70356f2805ec02f20b45bc9d06c0f81f63c8f 100644 GIT binary patch delta 4416 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 @@ -216,12 +216,14 @@ public class Board { blocks.launched--; } else if (blocks.launched==0) { + SplitBlockClump(blocks); + } + if (blocks.launched<=0) { for (Block b : blocks.getBlocks()) { if (b.state==BlockState.IGNITED) { b.state=STARTINGSTATES[(int)(Meteo.r.nextInt(3))]; } } - SplitBlockClump(blocks); } } private void SplitBlockClump(BlockClump blocks) {