Merge branch 'master' of

https://gitarero.ecam.fr/valentine.giral/OOP_3B3_Project.git

src/backend/Board.java

@@ -174,7 +174,17 @@ public class Board {
 		      if(selectedX == x && selectedY == y) {
 		            selectedPosition = null;
 		            highlightedPositions.clear(); //Unhighlight
+		            return;
 		        }
+
+		      //To check if square valid
+		      boolean valid = false;
+		      for (int[] pos : highlightedPositions) {
+		    	  if (pos[0]==x&&pos[1]==y) {
+		    		  valid = true;
+		    		  break;
+		    	  }
+
 		      
 		      // If a piece is selected and the user clicks a new position
 		      else {
@@ -198,7 +208,23 @@ public class Board {
 			      // Deselect the position after moving
 			      this.selectedPosition = null;
 			      highlightedPositions.clear();//Clear after move
+
 		      }
+		      // If a piece is selected and the user clicks a new position
+		      if (valid) {
+		    	  movePiece(selectedX, selectedY, x, y);
+		    	  //update turn
+		    	  this.turnNumber++;
+			      this.turnWhite=!this.turnWhite; 
+		      }
+		      else {
+		    	  System.out.println("Blocked! This is not a valid move.");
+		    	  
+		      }	
+			      // Deselect the position after moving
+			  this.selectedPosition = null;
+			  highlightedPositions.clear();//Clear after move
+		      
 		    } 
 		      
 	 }