From 3ab8de3a0787e512763713eab6e20999d6ad984b Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Thu, 23 Sep 2021 02:01:38 +0000 Subject: [PATCH] Identify all blocks in a stack by x,y position --- Meteo_Engine.jar | Bin 12201 -> 12329 bytes src/sig/Board.java | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index 7636ae0ad9bf64cc348bd87abdb19f0711d4c223..11f531c586adf219a2abe974184422a9fed42981 100644 GIT binary patch delta 5411 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 P5FRSXiMPe~chdg=^d=&# delta 5270 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 diff --git a/src/sig/Board.java b/src/sig/Board.java index 724df83..9757332 100644 --- a/src/sig/Board.java +++ b/src/sig/Board.java @@ -112,7 +112,13 @@ public class Board { //Start from one block and work our way across, seeing if we can make a match of 3 or more. Go to the next row, repeat. Then do the columns. Once all blocks marked for ignition, ignite them and send them. //Lowest block is used as the block clump starting point. for (int y=0;y bl = blocks.getBlocks().stream().filter((block)->block.x==xx&&block.y==yy).collect(Collectors.toList()); + if (bl.size()>0) { + //System.out.println("Found a block at ("+x+","+y+")"); + } + } } return false; }