fix deadlock

Author: loganmc10

internal/gameServer/server.go

@@ -94,8 +94,6 @@ func (g *GameServer) isConnClosed(err error) bool {
 }
 
 func (g *GameServer) bufferHealthAverage(playerNumber int) (float32, error) {
-	g.GameDataMutex.Lock()
-	defer g.GameDataMutex.Unlock()
 	var bufferHealth float32
 	if g.GameData.BufferHealth[playerNumber].Len() > 0 {
 		for _, k := range g.GameData.BufferHealth[playerNumber].Keys() {
@@ -118,6 +116,7 @@ func (g *GameServer) ManageBuffer() {
 		// Find the largest buffer health
 		var bufferHealth float32
 		var foundPlayer bool
+		g.GameDataMutex.Lock() // BufferHealth can be modified by processUDP in a different thread
 		for i := range 4 {
 			if g.GameData.CountLag[i] == 0 {
 				playerBufferHealth, err := g.bufferHealthAverage(i)
@@ -127,6 +126,7 @@ func (g *GameServer) ManageBuffer() {
 				}
 			}
 		}
+		g.GameDataMutex.Unlock()
 
 		if foundPlayer {
 			if bufferHealth > float32(g.BufferTarget)+0.5 && g.GameData.BufferSize > 0 {

internal/gameServer/udp.go

@@ -150,7 +150,7 @@ func (g *GameServer) processUDP(addr *net.UDPAddr) {
 			return
 		}
 		g.GameData.CountLag[sendingPlayerNumber] = g.sendUDPInput(count, addr, playerNumber, spectator != 0, sendingPlayerNumber)
-		g.GameDataMutex.Lock() // PlayerAlive and BufferHealth can be modified by ManagePlayers in a different thread
+		g.GameDataMutex.Lock() // PlayerAlive and BufferHealth can be modified in different threads
 		g.GameData.BufferHealth[sendingPlayerNumber].Add(count, g.GameData.recvBuffer[11])
 		g.GameData.PlayerAlive[sendingPlayerNumber] = true
 		g.GameDataMutex.Unlock()