Skip to content

Commit baea237

Browse files
loganmc10loganmc10
committed
use pl var for range
1 parent 450d8bc commit baea237

4 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎internal/gameServer/server.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ func (g *GameServer) ManagePlayers() {
181181

182182
g.registrations.Delete(i)
183183

184-
g.Players.Range(func(k, _ any) bool {
185-
if v.(Client).Number == int(i) {
184+
g.Players.Range(func(k, pl any) bool {
185+
if pl.(Client).Number == int(i) {
186186
g.Players.Delete(k)
187187
g.NeedsUpdatePlayers.Store(true)
188188
return false
@@ -209,8 +209,8 @@ func (g *GameServer) ManagePlayers() {
209209

210210
func (g *GameServer) IsRoomCreator(socket *websocket.Conn) bool {
211211
roomCreator := false
212-
g.Players.Range(func(_, v any) bool {
213-
if v.(Client).Number == 0 && v.(Client).Socket == socket {
212+
g.Players.Range(func(_, pl any) bool {
213+
if pl.(Client).Number == 0 && pl.(Client).Socket == socket {
214214
roomCreator = true
215215
return false
216216
} else {

‎internal/gameServer/tcp.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,8 @@ func (g *GameServer) processTCP(conn *net.TCPConn) {
340340
g.gameData.status |= (0x1 << (i + 1))
341341
g.registrations.Delete(i)
342342

343-
g.Players.Range(func(k, _ any) bool {
344-
if v.(Client).Number == int(i) {
343+
g.Players.Range(func(k, pl any) bool {
344+
if pl.(Client).Number == int(i) {
345345
g.Players.Delete(k)
346346
g.NeedsUpdatePlayers.Store(true)
347347
return false
@@ -408,8 +408,8 @@ func (g *GameServer) watchTCP() {
408408
conn.Close() //nolint:errcheck
409409
continue
410410
}
411-
g.Players.Range(func(_, v any) bool {
412-
if remoteAddr.IP.Equal(v.(Client).IP) {
411+
g.Players.Range(func(_, pl any) bool {
412+
if remoteAddr.IP.Equal(pl.(Client).IP) {
413413
validated = true
414414
return false
415415
} else {

‎internal/gameServer/udp.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ func (g *GameServer) watchUDP() {
181181

182182
if g.VerifyIP {
183183
validated := false
184-
g.Players.Range(func(_, v any) bool {
185-
if addr.IP.Equal(v.(Client).IP) {
184+
g.Players.Range(func(_, pl any) bool {
185+
if addr.IP.Equal(pl.(Client).IP) {
186186
validated = true
187187
return false
188188
} else {

‎internal/lobbyServer/lobby.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,18 @@ func (s *LobbyServer) updatePlayers(g *gameserver.GameServer) {
137137
sendMessage.PlayerNames = make([]string, 4)
138138
sendMessage.Type = TypeReplyPlayers
139139

140-
g.Players.Range(func(k, v any) bool {
141-
if v.(gameserver.Client).InLobby {
142-
sendMessage.PlayerNames[v.(gameserver.Client).Number] = k.(string)
140+
g.Players.Range(func(k, pl any) bool {
141+
if pl.(gameserver.Client).InLobby {
142+
sendMessage.PlayerNames[pl.(gameserver.Client).Number] = k.(string)
143143
}
144144
return true
145145
})
146146

147147
// send the updated player list to all connected players
148-
g.Players.Range(func(_, v any) bool {
149-
if v.(gameserver.Client).InLobby {
150-
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
151-
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", v.(gameserver.Client).Socket.RemoteAddr())
148+
g.Players.Range(func(_, pl any) bool {
149+
if pl.(gameserver.Client).InLobby {
150+
if err := s.sendData(pl.(gameserver.Client).Socket, sendMessage); err != nil {
151+
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", pl.(gameserver.Client).Socket.RemoteAddr())
152152
}
153153
}
154154
return true
@@ -169,10 +169,10 @@ func (s *LobbyServer) updateRoom(g *gameserver.GameServer, name string) {
169169
sendMessage.Type = TypeReplyEditRoom
170170

171171
// send the updated room to all connected players
172-
g.Players.Range(func(_, v any) bool {
173-
if v.(gameserver.Client).InLobby {
174-
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
175-
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", v.(gameserver.Client).Socket.RemoteAddr())
172+
g.Players.Range(func(_, pl any) bool {
173+
if pl.(gameserver.Client).InLobby {
174+
if err := s.sendData(pl.(gameserver.Client).Socket, sendMessage); err != nil {
175+
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", pl.(gameserver.Client).Socket.RemoteAddr())
176176
}
177177
}
178178
return true
@@ -300,14 +300,14 @@ func (s *LobbyServer) wsHandler(w http.ResponseWriter, r *http.Request) {
300300
err := ws.ReadJSON(&receivedMessage)
301301
if err != nil {
302302
for i, v := range s.gameServers {
303-
v.Players.Range(func(k, w any) bool {
304-
if w.(gameserver.Client).Socket == ws {
303+
v.Players.Range(func(k, pl any) bool {
304+
if pl.(gameserver.Client).Socket == ws {
305305
v.Logger.Info("Player has left lobby", "reason", err.Error(), "player", k, "address", ws.RemoteAddr())
306306

307307
if !v.Running.Load() {
308308
v.Players.Delete(k)
309309
} else {
310-
if client, ok := w.(gameserver.Client); ok {
310+
if client, ok := pl.(gameserver.Client); ok {
311311
client.InLobby = false
312312
v.Players.Store(k, client)
313313
}
@@ -541,8 +541,8 @@ func (s *LobbyServer) wsHandler(w http.ResponseWriter, r *http.Request) {
541541
var goodNumber bool
542542
for number = range 4 {
543543
goodNumber = true
544-
g.Players.Range(func(_, v any) bool {
545-
if v.(gameserver.Client).Number == number {
544+
g.Players.Range(func(_, pl any) bool {
545+
if pl.(gameserver.Client).Number == number {
546546
goodNumber = false
547547
return false
548548
} else {
@@ -606,9 +606,9 @@ func (s *LobbyServer) wsHandler(w http.ResponseWriter, r *http.Request) {
606606
sendMessage.Message = fmt.Sprintf("%s: %s", receivedMessage.PlayerName, receivedMessage.Message)
607607
_, g := s.findGameServer(receivedMessage.Room.Port)
608608
if g != nil {
609-
g.Players.Range(func(_, v any) bool {
610-
if v.(gameserver.Client).InLobby {
611-
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
609+
g.Players.Range(func(_, pl any) bool {
610+
if pl.(gameserver.Client).InLobby {
611+
if err := s.sendData(pl.(gameserver.Client).Socket, sendMessage); err != nil {
612612
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", ws.RemoteAddr())
613613
}
614614
}
@@ -640,8 +640,8 @@ func (s *LobbyServer) wsHandler(w http.ResponseWriter, r *http.Request) {
640640
} else {
641641
if g.BufferTarget == 0 {
642642
privateNetwork := true
643-
g.Players.Range(func(_, v any) bool {
644-
if !v.(gameserver.Client).IP.IsPrivate() {
643+
g.Players.Range(func(_, pl any) bool {
644+
if !pl.(gameserver.Client).IP.IsPrivate() {
645645
privateNetwork = false
646646
return false
647647
} else {
@@ -661,8 +661,8 @@ func (s *LobbyServer) wsHandler(w http.ResponseWriter, r *http.Request) {
661661
g.NumberOfPlayers = g.GetPlayersLength()
662662
sendMessage.Accept = Accepted
663663
go s.watchGameServer(roomName, g)
664-
g.Players.Range(func(_, v any) bool {
665-
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
664+
g.Players.Range(func(_, pl any) bool {
665+
if err := s.sendData(pl.(gameserver.Client).Socket, sendMessage); err != nil {
666666
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", ws.RemoteAddr())
667667
}
668668
return true

0 commit comments

Comments
 (0)