sigonasr2/meteo_engine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed edge case for block ignitions

Browse Source
This commit is contained in:
Joshua Sigona 2021-09-26 19:52:41 +09:00
parent 9da25c010a
commit c5b6fe2d2d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sig/Board.java
View File

@ -135,11 +135,11 @@ public class Board {
//System.out.println(blocks.getSortedBlocksOnRow(y));
List<Block> blockList = blocks.getSortedBlocksOnRow(y);
//System.out.println(" "+blockList);
markedBlocks.addAll(FindMatches(blockList));
addAllToListUnique(markedBlocks,FindMatches(blockList));
}
for (int x=0;x<width;x++) {
List<Block> blockList = blocks.getSortedBlocksOnCol(x);
markedBlocks.addAll(FindMatches(blockList));
addAllToListUnique(markedBlocks,FindMatches(blockList));
}
if (markedBlocks.size()>0) {
int minY=Integer.MAX_VALUE;
@ -162,7 +162,10 @@ public class Board {
}
return markedBlocks.size()>0;
}
private List<Block> FindMatches(List<Block> blockList) {
private void addAllToListUnique(List<Block> list, List<Block> listToAddFrom) {
list.addAll(listToAddFrom.stream().filter((block)->!list.contains(block)).collect(Collectors.toList()));
}
private List<Block> FindMatches(List<Block> blockList) {
List<Block> markedBlocks = new ArrayList<Block>();
List<Block> tempMarkedBlocks = new ArrayList<Block>();
if (blockList.size()==0) {return markedBlocks;}