player needs to be in actionPlayers in order to call events

boardgameio · Oct 19, 2018 · ea3754b · ea3754b
1 parent 5024015
commit ea3754b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/docs/events.md b/docs/events.md
@@ -5,7 +5,7 @@ analogous to a move, except that while a move changes
 `G`, an event changes `ctx`. Also, events are provided by the
 framework (as opposed to moves, which are written by you).
 
-Some events are enabled by default, and can be turned off if you dont want them. Others need to be explicity turned on in order to use them.
+Some events are enabled by default, and can be turned off if you dont want them. Others need to be explicity turned on in order to use them. Also note that only the current player can call events (and must also be an action player to do so).
 
 ##### endTurn
 

diff --git a/examples/react/turnorder/simulator.js b/examples/react/turnorder/simulator.js
@@ -47,7 +47,7 @@ class Board extends React.Component {
       ));
 
     const events = Object.entries(this.props.events)
-      .filter(() => current)
+      .filter(() => current && active)
       .filter(e => e[0] != 'setActionPlayers')
       .map(e => (
         <button key={e[0]} onClick={e[1]}>

diff --git a/src/core/flow.js b/src/core/flow.js
@@ -100,7 +100,9 @@ export function Flow({
     optimisticUpdate,
 
     canPlayerCallEvent: (G, ctx, playerID) => {
-      return ctx.currentPlayer == playerID;
+      return (
+        ctx.currentPlayer == playerID && ctx.actionPlayers.includes(playerID)
+      );
     },
 
     canPlayerMakeMove: (G, ctx, playerID) => {

diff --git a/src/core/flow.test.js b/src/core/flow.test.js
@@ -506,12 +506,20 @@ test('canPlayerCallEvent', () => {
 
   let flow = Flow({});
   expect(flow.canPlayerCallEvent({}, {}, playerID)).toBe(false);
-  expect(flow.canPlayerCallEvent({}, { actionPlayers: ['1'] }, playerID)).toBe(
-    false
-  );
-  expect(flow.canPlayerCallEvent({}, { actionPlayers: ['0'] }, playerID)).toBe(
-    false
-  );
+  expect(
+    flow.canPlayerCallEvent(
+      {},
+      { currentPlayer: '0', actionPlayers: ['1'] },
+      playerID
+    )
+  ).toBe(false);
+  expect(
+    flow.canPlayerCallEvent(
+      {},
+      { currentPlayer: '0', actionPlayers: ['0'] },
+      playerID
+    )
+  ).toBe(true);
 });
 
 test('endGame', () => {