fix #43, #42

pkg/edition/java/proxy/player.go

@@ -48,7 +48,7 @@ type Player interface {
 	// CreateConnectionRequest creates a connection request to begin switching the backend server.
 	CreateConnectionRequest(target RegisteredServer) ConnectionRequest
 	GameProfile() profile.GameProfile // Returns the player's game profile.
-	Settings() player.Settings        // The players client settings. Returns player.DefaultSettings if not yet unknown.
+	Settings() player.Settings        // The players client settings. Returns player.DefaultSettings if known.
 	// Disconnect disconnects the player with a reason.
 	// Once called, further interface calls to this player become undefined.
 	Disconnect(reason component.Component)

pkg/edition/java/proxy/proxy.go

@@ -485,13 +485,21 @@ func (p *Proxy) Players() []Player {
 func (p *Proxy) Player(id uuid.UUID) Player {
 	p.muP.RLock()
 	defer p.muP.RUnlock()
-	return p.playerIDs[id]
+	player, ok := p.playerIDs[id]
+	if !ok {
+		return nil // return correct nil
+	}
+	return player
 }
 
-// Player returns the online player by their Minecraft name (search is case-insensitive).
+// PlayerByName returns the online player by their Minecraft name (search is case-insensitive).
 // Returns nil if the player was not found.
 func (p *Proxy) PlayerByName(username string) Player {
-	return p.playerByName(username)
+	player := p.playerByName(username)
+	if player == (*connectedPlayer)(nil) {
+		return nil // return correct nil
+	}
+	return player
 }
 func (p *Proxy) playerByName(username string) *connectedPlayer {
 	p.muP.RLock()