1 files changed, 11 insertions, 4 deletions
diff --git a/internal/game/cmd_shutdown.go b/internal/game/cmd_shutdown.go
index 0030649..9a57c6b 100644
--- a/internal/game/cmd_shutdown.go
+++ b/internal/game/cmd_shutdown.go
@@ -105,9 +105,16 @@ func (g *Game) broadcastLoggedIn(msg string) {
 	if g.Hub == nil {
 		return
 	}
-	for _, other := range g.Hub.AllSessions() {
-		if other.Player != nil {
-			other.WriteLine(msg)
+	// Player pointers and option maps are owner-owned. Route the broadcast
+	// through the owner so it cannot race a login/logout or an option change
+	// from a raw shutdown goroutine (a concurrent map read/write would fatal
+	// the process before the final save). Drops harmlessly once the owner has
+	// stopped.
+	g.run(func() {
+		for _, other := range g.Hub.AllSessions() {
+			if other.Player != nil {
+				other.WriteLine(msg)
+			}
 		}
-	}
+	})
 }