X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=game.js;h=55145bbaee018b89d37aff24c2c617f907fc1636;hb=771e0ce4711a7ed723d216c28ab8d1472463d3ef;hp=0023257e796c1f56e49e2fe62742c6ec1f35454b;hpb=d7b96ee0316021fa7a5e428950e2d8a9d8754582;p=lmno-server

diff --git a/game.js b/game.js
index 0023257..55145bb 100644
--- a/game.js
+++ b/game.js
@@ -162,8 +162,18 @@ class Game {
   }
 
   add_player(session, connection) {
+    let nickname = session.nickname;
+
     /* First see if we already have a player object for this session. */
-    const existing = this.players_by_session[session.id];
+    let existing = this.players_by_session[session.id];
+
+    /* Otherwise, see if we can match an inactive player by name. */
+    if (! existing) {
+      existing = this.players.find(player =>
+                                   player.name == nickname &&
+                                   ! player.active);
+    }
+
     if (existing) {
       if (! existing.active) {
         /* If we're re-activating a previously idled player, then we
@@ -179,7 +189,6 @@ class Game {
 
     /* No existing player. Add a new one. */
     const id = this.next_player_id;
-    let nickname = session.nickname;
     if (nickname === "")
       nickname = "Guest";
     const nickname_orig = nickname;
@@ -249,6 +258,10 @@ class Game {
     this.broadcast_event(type, JSON.stringify(obj));
   }
 
+  game_state_json() {
+    return JSON.stringify(this.state, stringify_replacer);
+  }
+
   handle_events(request, response) {
     /* These headers will keep the connection open so we can stream events. */
     const headers = {
@@ -284,8 +297,7 @@ class Game {
     /* Finally, if this game class has a "state" property, stream that
      * current state to the client. */
     if (this.state) {
-      const state_json = JSON.stringify(this.state, stringify_replacer);
-      response.write(`event: game-state\ndata: ${state_json}\n\n`);
+      response.write(`event: game-state\ndata: ${this.game_state_json()}\n\n`);
     }
   }