a few more fixes

Author: loganmc10

internal/gameServer/server.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -47,7 +48,7 @@ type GameServer struct {
 	VerifyIP           bool
 	Running            bool
 	Features           map[string]string
-	NeedsUpdatePlayers bool
+	NeedsUpdatePlayers atomic.Bool
 	NumberOfPlayers    int
 	BufferTarget       byte
 	QuitChannel        *chan bool
@@ -184,7 +185,7 @@ func (g *GameServer) ManagePlayers() {
 					g.Players.Range(func(k, v any) bool {
 						if v.(Client).Number == int(i) {
 							g.Players.Delete(k)
-							g.NeedsUpdatePlayers = true
+							g.NeedsUpdatePlayers.Store(true)
 						}
 						return true
 					})

internal/gameServer/tcp.go

@@ -340,18 +340,16 @@ func (g *GameServer) processTCP(conn *net.TCPConn) {
 					g.gameDataMutex.Lock()
 					g.gameData.playerAlive[i] = false
 					g.gameData.status |= (0x1 << (i + 1))
-					g.gameDataMutex.Unlock()
 					g.registrations.Delete(i)
 
 					g.Players.Range(func(k, v any) bool {
 						if v.(Client).Number == int(i) {
 							g.Players.Delete(k)
-							g.NeedsUpdatePlayers = true
+							g.NeedsUpdatePlayers.Store(true)
 						}
 						return true
 					})
 
-					g.gameDataMutex.Lock()
 					g.gameData.bufferHealth[i] = g.gameData.bufferHealth[i][:0]
 					g.gameDataMutex.Unlock()
 				}

internal/lobbyServer/lobby.go

@@ -245,8 +245,8 @@ func (s *LobbyServer) watchGameServer(name string, g *gameserver.GameServer) {
 			delete(s.gameServers, name)
 			return
 		}
-		if g.NeedsUpdatePlayers {
-			g.NeedsUpdatePlayers = false
+		if g.NeedsUpdatePlayers.Load() {
+			g.NeedsUpdatePlayers.Store(false)
 			s.updatePlayers(g)
 		}
 		time.Sleep(time.Second * 5)