Merge pull request #50 from Longwater1234/dev

Remove dangerous actions

main.go

@@ -18,7 +18,7 @@ import (
 	"golang.org/x/net/websocket"
 )
 
-const SERVER_VERSION = "1.0.9"
+const ServerVersion = "1.0.9"
 const maxRequestSize int = 1 << 10 // 1KB
 
 var numPlayers atomic.Uint32             // total number of LIVE players
@@ -81,7 +81,7 @@ func listenForJoins() {
 			Inner: &game.BasePayload_Welcome{
 				Welcome: &game.WelcomePayload{
 					MyTeam:        game.TeamColor_TEAM_RED,
-					ServerVersion: SERVER_VERSION,
+					ServerVersion: ServerVersion,
 				},
 			},
 		}
@@ -112,7 +112,6 @@ func listenForJoins() {
 				room.StartMatch(p1, p2, gameOver)
 				<-gameOver //block until match ends
 				log.Println("🔴 GAME OVER!")
-				close(gameOver)
 				p1.Dead <- true
 				p2.Dead <- true
 			}(p1, p2)

player/member.go

@@ -51,7 +51,7 @@ func (p *Player) HasThisPiece(pieceId int32) bool {
 	return slices.Contains(p.Pieces, pieceId)
 }
 
-// StartHeartbeat keeps checking (every second) if this player is still connected (when waiting for opponent)
+// StartHeartbeat for checking (every second) if this Player is still connected (when waiting for opponent)
 func (p *Player) StartHeartbeat(ctx context.Context) {
 	tt := time.NewTicker(time.Second)
 	qq := make(chan bool)
@@ -60,11 +60,13 @@ func (p *Player) StartHeartbeat(ctx context.Context) {
 		select {
 		case <-tt.C:
 			if err := pingCodec.Send(p.Conn, nil); err != nil {
-				//This player has quit early
+				// This player has quit early
 				qq <- true
+				close(qq)
 				return
 			}
 		case <-ctx.Done():
+			// timeout waiting for [p2] expired
 			tt.Stop()
 			return
 		}

room/generator.go

@@ -58,7 +58,8 @@ func generateGameMap(p1 *player.Player, p2 *player.Player) map[int32]*game.Piece
 	return gameMap
 }
 
-// generatePieces using Secure RNG for both player 1 (RED) and player 2 (BLACK)
+// generatePieces using secure RNG for the two players. If an error occurs,
+// it sends a signal to the `gameOver` channel and panics.
 func generatePieces(p1 *player.Player, p2 *player.Player, gameOver chan<- bool) {
 	bigMax := big.NewInt(int64(upperLimit))
 	for i := 0; i < len(p1.Pieces); i++ {