Prevent clicking on flags from revealing

board.js

@@ -192,15 +192,19 @@ Board.prototype.mineCount = function(x, y) {
  * @param  {number} x x-coordinate of the square to reveal
  * @param  {number} y y-coordinate of the square to reveal
  * @param {string} [username] username of the person that revealed the square
+ * @param {boolean} true if this reveal was initiated by a user clicking the square
+ * 					as opposed to a recursive call to reveal more 0s
+ * 					if this is true and the square is flagged, no changes are made
  * @return {Array<Object>}   Array of squares that have been changed
  */
-Board.prototype.reveal = function(x, y, username) {
+Board.prototype.reveal = function(x, y, username, firstClick) {
 	if (!this.generated) {
 		this.generate(x, y);
 		username = 'default';
 	}
 
-	if (this.squares[x][y].revealed)
+	// Prevent users from erroneously clicking a flagged mine
+	if (this.squares[x][y].revealed || (firstClick && this.squares[x][y].flagged))
 		return [];
 
 	this.squares[x][y].revealed = true;
@@ -232,7 +236,7 @@ Board.prototype.reveal = function(x, y, username) {
 	if (this.squares[x][y].count === 0 && !this.squares[x][y].mine) {
 		var adjacentSquares = this.getAdjacentSquares(x, y);
 		for (let i in adjacentSquares)
-			changedSquares = changedSquares.concat(this.reveal(adjacentSquares[i].x, adjacentSquares[i].y, username));
+			changedSquares = changedSquares.concat(this.reveal(adjacentSquares[i].x, adjacentSquares[i].y, username, false));
 	}
 
 	return changedSquares;

game.js

@@ -107,11 +107,11 @@ Game.prototype.getBoard = function() {
   return this.board;
 };
 
-Game.prototype.reveal = function(x, y, username) {
+Game.prototype.reveal = function(x, y, username, firstClick) {
   if (this.resetting)
     return [];
 
-  var revealedSquares = this.board.reveal(x, y, username);
+  var revealedSquares = this.board.reveal(x, y, username, firstClick);
 
   if (!this.board.lost)
     for (let i in revealedSquares)

index.js

@@ -73,11 +73,11 @@ io.on('connection', (socket) => {
   });
 
 
-  socket.on('reveal', (coord) => {
+  socket.on('reveal', (args) => {
     if (game.resetting)
       return;
 
-    io.to(game.gameId).emit('squares', game.reveal(coord.x, coord.y, username));
+    io.to(game.gameId).emit('squares', game.reveal(args.x, args.y, username, args.firstClick));
     io.to(game.gameId).emit('flag count', game.getBoard().flagCount);
     io.to(game.gameId).emit('players', game.getPlayers());
 

js/client.js

@@ -71,7 +71,8 @@ socket.on('board', function (board_data) {
         if (isCurrentlyRevealMode())
           socket.emit('reveal', {
             x: parseInt($(this).prop('id').split('-')[0]),
-            y: parseInt($(this).prop('id').split('-')[1])
+            y: parseInt($(this).prop('id').split('-')[1]),
+            firstClick: true
           });
         else
           socket.emit('flag', {