scribble-rs
diff --git a/‎internal/api/v1.go
Copy file name to clipboardExpand all lines: internal/api/v1.go
+1-1Lines changed: 1 addition & 1 deletion b/‎internal/api/v1.go
Copy file name to clipboardExpand all lines: internal/api/v1.go
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎internal/api/ws.go
Copy file name to clipboardExpand all lines: internal/api/ws.go
+1-1Lines changed: 1 addition & 1 deletion b/‎internal/api/ws.go
Copy file name to clipboardExpand all lines: internal/api/ws.go
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎internal/game/data.go
Copy file name to clipboardExpand all lines: internal/game/data.go
+12-3Lines changed: 12 additions & 3 deletions b/‎internal/game/data.go
Copy file name to clipboardExpand all lines: internal/game/data.go
+12-3Lines changed: 12 additions & 3 deletions
@@ -544,7 +544,7 @@ func GetPlayer(lobby *game.Lobby, request *http.Request) *game.Player {
 		return nil
 	}
 
-	return lobby.GetPlayer(userSession)
+	return lobby.GetPlayerBySession(userSession)
 }
 
 // GetPlayername either retrieves the playername from a cookie, the URL form.
 
@@ -61,7 +61,7 @@ func (handler *V1Handler) websocketUpgrade(writer http.ResponseWriter, request *
 	}
 
 	lobby.Synchronized(func() {
-		player := lobby.GetPlayer(userSession)
+		player := lobby.GetPlayerBySession(userSession)
 		if player == nil {
 			http.Error(writer, "you don't have access to this lobby;usersession unknown", http.StatusUnauthorized)
 			return
 
@@ -164,8 +164,17 @@ const (
 	Spectating PlayerState = "spectating"
 )
 
-// GetPlayer searches for a player, identifying them by usersession.
-func (lobby *Lobby) GetPlayer(userSession uuid.UUID) *Player {
+func (lobby *Lobby) GetPlayerByID(id uuid.UUID) *Player {
+	for _, player := range lobby.Players {
+		if player.ID == player.ID {
+			return player
+		}
+	}
+
+	return nil
+}
+
+func (lobby *Lobby) GetPlayerBySession(userSession uuid.UUID) *Player {
 	for index, uuid := range lobby.UserSessions {
 		if uuid == userSession {
 			return lobby.Players[index]
@@ -175,7 +184,7 @@ func (lobby *Lobby) GetPlayer(userSession uuid.UUID) *Player {
 }
 
 func (lobby *Lobby) GetOwner() *Player {
-	return lobby.GetPlayer(lobby.OwnerID)
+	return lobby.GetPlayerByID(lobby.OwnerID)
 }
 
 func (lobby *Lobby) ClearDrawing() {
Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ func GetPlayer(lobby game.Lobby, request http.Request) *game.Player {`
`544`	`544`	`return nil`
`545`	`545`	`}`
`546`	`546`
`547`		`- return lobby.GetPlayer(userSession)`
	`547`	`+ return lobby.GetPlayerBySession(userSession)`
`548`	`548`	`}`
`549`	`549`
`550`	`550`	`// GetPlayername either retrieves the playername from a cookie, the URL form.`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func (handler V1Handler) websocketUpgrade(writer http.ResponseWriter, request `
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`lobby.Synchronized(func() {`
`64`		`- player := lobby.GetPlayer(userSession)`
	`64`	`+ player := lobby.GetPlayerBySession(userSession)`
`65`	`65`	`if player == nil {`
`66`	`66`	`http.Error(writer, "you don't have access to this lobby;usersession unknown", http.StatusUnauthorized)`
`67`	`67`	`return`