game: Fix reactivation of an existing player to be fully active

[empires-server] / game.js

diff --git a/game.js b/game.js
index 7ca150735269d0c0b6c4bc0681e70302d4a41813..f244eaa32ef7901c1f5eb484ec3626906408334f 100644 (file)
--- a/game.js
+++ b/game.js
@@ -59,6 +59,7 @@ class Game {
     this.id = id;
     this.players = [];
     this.players_by_session = {};
+    this.active_players = 0;
     this.next_player_id = 1;
     this.teams = [];
     this.state = {
@@ -165,6 +166,15 @@ class Game {
     const existing = this.players_by_session[session.id];
     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.
+         */
+        existing.active = true;
+        this.active_players++;
+        const player_data = JSON.stringify({ id: existing.id, name: existing.name });
+        this.broadcast_event("player-enter", player_data);
+      }
       return existing;
     }
 
@@ -192,6 +202,7 @@ class Game {
 
     this.players.push(player);
     this.players_by_session[session.id] = player;
+    this.active_players++;
     this.next_player_id++;
 
     /* After adding the player to the list, and if we are already past
@@ -216,6 +227,7 @@ class Game {
     const remaining = player.remove_connection(connection);
     if (remaining === 0) {
       player.active = false;
+      this.active_players--;
       const player_data = JSON.stringify({ id: player.id });
       this.broadcast_event("player-exit", player_data);
     }