Amolith
/
codies
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Reject duplicate client IDs" 

This reverts commit bee5fe4af3.
This commit is contained in:
zikaeroh 2020-06-14 12:33:07 -07:00
parent bee5fe4af3
commit 3a57f683ac
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/server/server.go
View File

@ -245,15 +245,7 @@ func (r *Room) HandleConn(ctx context.Context, playerID uuid.UUID, nickname stri
g, ctx := errgroup.WithContext(ctx) g, ctx := errgroup.WithContext(ctx)
setup := func() (success bool) {
r.mu.Lock() r.mu.Lock()
defer r.mu.Unlock()
if _, ok := r.players[playerID]; ok {
ctxlog.Warn(ctx, "client with this ID already exists")
return false
}
r.players[playerID] = func(s protocol.ServerNote) { r.players[playerID] = func(s protocol.ServerNote) {
if ctx.Err() != nil { if ctx.Err() != nil {
return return
@ -272,12 +264,7 @@ func (r *Room) HandleConn(ctx context.Context, playerID uuid.UUID, nickname stri
} }
r.room.AddPlayer(playerID, nickname) r.room.AddPlayer(playerID, nickname)
r.sendAll() r.sendAll()
return true r.mu.Unlock()
}
if !setup() {
return
}
defer func() { defer func() {
r.mu.Lock() r.mu.Lock()