shouldEndPhase can see the results of onTurnEnd

boardgameio · Sep 21, 2018 · d1a1a8a · d1a1a8a
1 parent 2f6042b
commit d1a1a8a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core/flow.js b/src/core/flow.js
@@ -500,6 +500,8 @@ export function FlowWithPhases({
     // Update state.
     ctx = { ...ctx, turn };
 
+    state = { ...state, G, ctx };
+
     // End phase if condition is met.
     const endPhaseArg = shouldEndPhase(state);
     if (endPhaseArg) {
@@ -508,12 +510,12 @@ export function FlowWithPhases({
 
     if (endPhase) {
       return this.dispatch(
-        { ...state, G, ctx },
+        state,
         automaticGameEvent('endPhase', [endPhaseArg], this.playerID)
       );
     }
 
-    return startTurn({ ...state, G, ctx }, conf);
+    return startTurn(state, conf);
   }
 
   function endGameEvent(state, arg) {