Don't send a re-connecting player a player-enter event for themself

[empires-server] / game.js

diff --git a/game.js b/game.js
index 8ea26e34084d140a84d51454cfdaf2c58846bba6..0023257e796c1f56e49e2fe62742c6ec1f35454b 100644 (file)
--- a/game.js
+++ b/game.js
@@ -165,6 +165,14 @@ class Game {
     /* First see if we already have a player object for this session. */
     const existing = this.players_by_session[session.id];
     if (existing) {
+      if (! existing.active) {
+        /* If we're re-activating a previously idled player, then we
+         * need to alert everyone that this player is now back.
+         */
+        existing.active = true;
+        this.active_players++;
+        this.broadcast_event("player-enter", existing.info_json());
+      }
       existing.add_connection(connection);
       return existing;
     }
@@ -188,8 +196,7 @@ class Game {
 
     /* Broadcast before adding player to list (to avoid announcing the
      * new player to itself). */
-    const player_data = JSON.stringify({ id: player.id, name: player.name });
-    this.broadcast_event("player-enter", player_data);
+    this.broadcast_event("player-enter", player.info_json());
 
     this.players.push(player);
     this.players_by_session[session.id] = player;