empathy: Don't allow a prompt with 0 items

[empires-server] / game.js

diff --git a/game.js b/game.js
index 5386cd212d902b7fb5e2266b26a4c8690ef7b3d2..55145bbaee018b89d37aff24c2c617f907fc1636 100644 (file)
--- a/game.js
+++ b/game.js
@@ -162,10 +162,19 @@ 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) {
-      existing.add_connection(connection);
       if (! existing.active) {
         /* If we're re-activating a previously idled player, then we
          * need to alert everyone that this player is now back.
@@ -174,12 +183,12 @@ class Game {
         this.active_players++;
         this.broadcast_event("player-enter", existing.info_json());
       }
+      existing.add_connection(connection);
       return existing;
     }
 
     /* 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`);
     }
   }