]> git.cworth.org Git - empires-server/commitdiff
Fix player-enter events to use complete info_json() method
authorCarl Worth <cworth@cworth.org>
Sat, 27 Jun 2020 17:20:25 +0000 (10:20 -0700)
committerCarl Worth <cworth@cworth.org>
Sat, 27 Jun 2020 17:20:25 +0000 (10:20 -0700)
Previous to this commit, the player-enter event was hardcoded to send
only ID and name properties, which was enough for an actual new
player. But a player-enter event can also happen when a player
re-joins after being disconnected. In this case, we want the score to
be sent as well.

We can get everything we want by using the player's info_json() method
rather than doing a custom call to JSON.stringify with a hard-coded
list of properties.

game.js

diff --git a/game.js b/game.js
index f244eaa32ef7901c1f5eb484ec3626906408334f..5386cd212d902b7fb5e2266b26a4c8690ef7b3d2 100644 (file)
--- a/game.js
+++ b/game.js
@@ -172,8 +172,7 @@ class Game {
          */
         existing.active = true;
         this.active_players++;
-        const player_data = JSON.stringify({ id: existing.id, name: existing.name });
-        this.broadcast_event("player-enter", player_data);
+        this.broadcast_event("player-enter", existing.info_json());
       }
       return existing;
     }
@@ -197,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;