fixed a bug where diagonal non empty cells can be retrieved on pendin…

…g fall moves
ninetailsrabbit · Jun 16, 2024 · f2fd568 · f2fd568
1 parent f7b6e86
commit f2fd568
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Match3Maker/Match3Maker.csproj b/Match3Maker/Match3Maker.csproj
@@ -14,7 +14,7 @@
 
 	<PropertyGroup>
 		<Title>Ninetailsrabbit.Match3Maker</Title>
-		<Version>1.1.6</Version>
+		<Version>1.1.7</Version>
 		<Description>This lightweight library provides the core logic and functionality you need to build engaging match-3 games. Focus on game design and mechanics while leaving the complex logic to this library</Description>
 		<Copyright>© 2024 Ninetailsrabbit</Copyright>
 		<Authors>Ninetailsrabbit</Authors>

diff --git a/Match3Maker/src/components/Board.cs b/Match3Maker/src/components/Board.cs
@@ -574,7 +574,8 @@ public List<GridCell> PendingFallMoves(IEnumerable<GridCell>? cells = null) {
 
             return cells.Where(cell => cell.HasPiece() && cell.Piece.Type.CanBeMoved() && cell.NeighbourBottom is not null)
                 .Where(cell => (SelectedFillMode.Equals(FILL_MODES.FALL_DOWN) && cell.NeighbourBottom.IsEmpty()) ||
-                 (SelectedFillMode.Equals(FILL_MODES.SIDE_DOWN) && (cell.NeighbourBottom.IsEmpty() || cell.NeighbourBottom.HasPiece()) && (cell.DiagonalNeighbourBottomRight.IsEmpty() || cell.DiagonalNeighbourBottomLeft.IsEmpty()))
+                 (SelectedFillMode.Equals(FILL_MODES.SIDE_DOWN) && (cell.NeighbourBottom.IsEmpty() || cell.NeighbourBottom.HasPiece())
+                 && (cell.DiagonalNeighbourBottomRight is not null && cell.DiagonalNeighbourBottomRight.IsEmpty() || cell.DiagonalNeighbourBottomLeft is not null && cell.DiagonalNeighbourBottomLeft.IsEmpty()))
                 )
                 .ToList();
         }