fix(plugins): Fix PluginPlayer setup (#543)

* test(plugins): Add test for PluginPlayer with game phases

* fix(plugins): Don’t restore player & opponent to G.players if undefined

Fixes #530

Co-authored-by: Nicolo John Davis <nicolodavis@gmail.com>

src/plugins/plugin-player.js

@@ -33,11 +33,11 @@ export default {
 
       const players = {
         ...G.players,
-        [current]: G.player,
+        [current]: 'player' in G ? G.player : G.players[current],
       };
 
       if (other !== null) {
-        players[other] = G.opponent;
+        players[other] = 'opponent' in G ? G.opponent : G.players[other];
       }
 
       {

src/plugins/plugin-player.test.js

@@ -100,3 +100,32 @@ describe('3 player game', () => {
     });
   });
 });
+
+describe('game with phases', () => {
+  let client;
+
+  beforeAll(() => {
+    const game = {
+      playerSetup: id => ({ id }),
+      plugins: [PluginPlayer],
+      phases: {
+        phase: {},
+      },
+    };
+
+    client = Client({ game });
+  });
+
+  test('includes playerSetup state', () => {
+    expect(client.getState().G).toEqual({
+      players: {
+        0: {
+          id: '0',
+        },
+        1: {
+          id: '1',
+        },
+      },
+    });
+  });
+});