Skip to content

Commit 450d8bc

Browse files
committed
use underscore
1 parent 01d5e36 commit 450d8bc

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

internal/gameServer/server.go

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

182182
g.registrations.Delete(i)
183183

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

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

internal/gameServer/tcp.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ 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, v any) bool {
343+
g.Players.Range(func(k, _ any) bool {
344344
if v.(Client).Number == int(i) {
345345
g.Players.Delete(k)
346346
g.NeedsUpdatePlayers.Store(true)
@@ -408,7 +408,7 @@ func (g *GameServer) watchTCP() {
408408
conn.Close() //nolint:errcheck
409409
continue
410410
}
411-
g.Players.Range(func(k, v any) bool {
411+
g.Players.Range(func(_, v any) bool {
412412
if remoteAddr.IP.Equal(v.(Client).IP) {
413413
validated = true
414414
return false

internal/gameServer/udp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func (g *GameServer) watchUDP() {
181181

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

internal/lobbyServer/lobby.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (s *LobbyServer) updatePlayers(g *gameserver.GameServer) {
145145
})
146146

147147
// send the updated player list to all connected players
148-
g.Players.Range(func(k, v any) bool {
148+
g.Players.Range(func(_, v any) bool {
149149
if v.(gameserver.Client).InLobby {
150150
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
151151
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", v.(gameserver.Client).Socket.RemoteAddr())
@@ -169,7 +169,7 @@ 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(k, v any) bool {
172+
g.Players.Range(func(_, v any) bool {
173173
if v.(gameserver.Client).InLobby {
174174
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
175175
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", v.(gameserver.Client).Socket.RemoteAddr())
@@ -507,7 +507,7 @@ func (s *LobbyServer) wsHandler(w http.ResponseWriter, r *http.Request) {
507507
sendMessage.Type = TypeReplyJoinRoom
508508
roomName, g := s.findGameServer(receivedMessage.Room.Port)
509509
if g != nil {
510-
g.Players.Range(func(k, i any) bool {
510+
g.Players.Range(func(k, _ any) bool {
511511
if receivedMessage.PlayerName == k {
512512
duplicateName = true
513513
return false
@@ -541,7 +541,7 @@ 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(k, v any) bool {
544+
g.Players.Range(func(_, v any) bool {
545545
if v.(gameserver.Client).Number == number {
546546
goodNumber = false
547547
return false
@@ -606,7 +606,7 @@ 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(k, v any) bool {
609+
g.Players.Range(func(_, v any) bool {
610610
if v.(gameserver.Client).InLobby {
611611
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
612612
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", ws.RemoteAddr())
@@ -640,7 +640,7 @@ 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(k, v any) bool {
643+
g.Players.Range(func(_, v any) bool {
644644
if !v.(gameserver.Client).IP.IsPrivate() {
645645
privateNetwork = false
646646
return false
@@ -661,7 +661,7 @@ 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(k, v any) bool {
664+
g.Players.Range(func(_, v any) bool {
665665
if err := s.sendData(v.(gameserver.Client).Socket, sendMessage); err != nil {
666666
s.Logger.Error(err, "failed to send message", "message", sendMessage, "address", ws.RemoteAddr())
667667
}

0 commit comments

Comments
 (0)