X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=game.js;h=f078c354d44164b4f5ad449b372c3f7cb258e056;hb=bf51534cfe9f8f1d90fd6df4ae590fdecdc2825e;hp=f9e18cb760725eb9d05a993115bf286f5f0b2e85;hpb=3740e6f5ca87eac244bc2969b19a37939e9efc28;p=empires-server

diff --git a/game.js b/game.js
index f9e18cb..f078c35 100644
--- a/game.js
+++ b/game.js
@@ -36,6 +36,7 @@ class Player {
   info_json() {
     return JSON.stringify({
       id: this.id,
+      active: this.active,
       name: this.name,
       team: this.team.name,
       score: this.score
@@ -184,6 +185,7 @@ class Game {
         this.broadcast_event("player-enter", existing.info_json());
       }
       existing.add_connection(connection);
+      this.players_by_session[session.id] = existing;
       return existing;
     }
 
@@ -258,6 +260,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 = {
@@ -286,15 +292,16 @@ class Game {
     response.write(`event: player-info\ndata: ${player.info_json()}\n\n`);
 
     /* As well as player-enter events for all existing, active players. */
-    this.players.filter(p => p !== player && p.active).forEach(p => {
+    this.players.filter(
+      p => (p !== player
+            && (p.active || p.score))).forEach(p => {
       response.write(`event: player-enter\ndata: ${p.info_json()}\n\n`);
     });
 
     /* 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`);
     }
   }