From 43a35354420040213191fc8f75b285c518e6f7c8 Mon Sep 17 00:00:00 2001
From: Alexander Bass <contact@alexanderbass.com>
Date: Fri, 24 Jun 2022 15:25:38 -0400
Subject: [PATCH] fix flagging issue

---
 client/scripts/interface/mainmenu/create.js | 2 +-
 client/scripts/net/netcode.js               | 1 -
 server/src/server/netcode.ts                | 2 +-
 server/src/world/flagger.ts                 | 9 ++++-----
 server/src/world/world.ts                   | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/client/scripts/interface/mainmenu/create.js b/client/scripts/interface/mainmenu/create.js
index 012e741..71dd43e 100644
--- a/client/scripts/interface/mainmenu/create.js
+++ b/client/scripts/interface/mainmenu/create.js
@@ -154,7 +154,7 @@ function createGameClick(event) {
 	const name = ID("createGameUsername").value
 	const width = Number(widthBox.value);
 	const height = Number(heightBox.value);
-  const color = Number(colorPicker.selected);
+  const color = Number(colorPicker.selected + 1);
 	if (name == '' || mines == '' || width == '' || height == '' || status.get() == 'disconnected') return
 	const options = { mines: mines, width: width, height: height};
 	const data = {name: name, color: color, options: options};
diff --git a/client/scripts/net/netcode.js b/client/scripts/net/netcode.js
index 2d19836..9978429 100644
--- a/client/scripts/net/netcode.js
+++ b/client/scripts/net/netcode.js
@@ -64,6 +64,5 @@ socket.on('inGame', function(data){
 
 socket.on('sync', function (sync){
   game.world = sync.world;
-	console.log(game.world)
   render()
 })
diff --git a/server/src/server/netcode.ts b/server/src/server/netcode.ts
index e63e1fb..eecee00 100644
--- a/server/src/server/netcode.ts
+++ b/server/src/server/netcode.ts
@@ -57,7 +57,7 @@ function connected(client:any) {
 
     client.on('clickCanvas', function(data:any){
       if (!roomManager.getAllPlayerIDs().includes(client.id)) return new IllegalAction(client.id, 1)
-      client.game.world.click(data.tilePosition[0],data.tilePosition[1], data.mode, client.player)
+      client.game.world.click(data.tilePosition[0],data.tilePosition[1], data.mode, client.player.color)
       client.sync()
     })
 }
diff --git a/server/src/world/flagger.ts b/server/src/world/flagger.ts
index 97ec29d..77e68cc 100644
--- a/server/src/world/flagger.ts
+++ b/server/src/world/flagger.ts
@@ -1,12 +1,11 @@
 import {WorldData} from "./world.js"
 import {Player} from "../player.js"
 
-export function flag(x:number, y:number, data:WorldData, player:Player):WorldData {
+export function flag(x:number, y:number, data:WorldData, playerColor:number):WorldData {
   let tile = data[x][y]
 
-  if (!tile.mask || tile.flag === 0) return data
-  const color:number = +player.color
-  console.log(player)
+  if (!tile.mask) return data
+  const color:number = +playerColor
 
   switch (tile.flag) {
     case (0):
@@ -18,7 +17,7 @@ export function flag(x:number, y:number, data:WorldData, player:Player):WorldDat
     default:
         tile.flag = 0;
   }
-    console.log(tile.flag)
+
   data[x][y] = tile
   return data;
 }
diff --git a/server/src/world/world.ts b/server/src/world/world.ts
index 6be2c6f..12f82f7 100644
--- a/server/src/world/world.ts
+++ b/server/src/world/world.ts
@@ -31,10 +31,10 @@ export class World {
     }
   }
 
-  click (x:number, y:number, mode:number, player:Player) {
+  click (x:number, y:number, mode:number, playerColor:number) {
     if (this.isGenerated) {
       if (mode === 2) {
-        this.data = flagger.flag(x, y, this.data, player)
+        this.data = flagger.flag(x, y, this.data, playerColor)
       }
 
       if (mode === 0) {