fix(flow): Run turn.endIf after setActivePlayers event

Author: delucis

src/core/flow.ts

@@ -7,7 +7,6 @@
  */
 
 import {
-  SetActivePlayersEvent,
   SetActivePlayers,
   UpdateActivePlayersOnceEmpty,
   InitTurnOrderState,
@@ -21,6 +20,7 @@ import * as logging from './logger';
 import type {
   ActionPayload,
   ActionShape,
+  ActivePlayersArg,
   State,
   Ctx,
   LogEntry,
@@ -240,7 +240,7 @@ export function Flow({
       }
 
       // Check if we should end the turn.
-      if (fn === OnMove || fn === UpdateStage) {
+      if ([OnMove, UpdateStage, UpdateActivePlayers].includes(fn)) {
         const shouldEndTurn = ShouldEndTurn(state);
         if (shouldEndTurn) {
           events.push({
@@ -392,6 +392,10 @@ export function Flow({
     return { ...state, ctx };
   }
 
+  function UpdateActivePlayers(state: State, { arg }): State {
+    return { ...state, ctx: SetActivePlayers(state.ctx, arg) };
+  }
+
   ///////////////
   // ShouldEnd //
   ///////////////
@@ -685,6 +689,14 @@ export function Flow({
     return Process(state, [{ fn: EndStage, playerID }]);
   }
 
+  function SetActivePlayersEvent(
+    state: State,
+    _playerID: PlayerID,
+    arg: ActivePlayersArg | PlayerID[]
+  ): State {
+    return Process(state, [{ fn: UpdateActivePlayers, arg }]);
+  }
+
   function SetPhaseEvent(
     state: State,
     _playerID: PlayerID,

src/core/turn-order.ts

@@ -17,18 +17,10 @@ import type {
   TurnConfig,
 } from '../types';
 
-/**
- * Event to change the active players (and their stages) in the current turn.
- */
-export function SetActivePlayersEvent(
-  state: State,
-  _playerID: PlayerID,
+export function SetActivePlayers(
+  ctx: Ctx,
   arg: ActivePlayersArg | PlayerID[]
-) {
-  return { ...state, ctx: SetActivePlayers(state.ctx, arg) };
-}
-
-export function SetActivePlayers(ctx: Ctx, arg: ActivePlayersArg | PlayerID[]) {
+): Ctx {
   let activePlayers: typeof ctx.activePlayers = {};
   let _prevActivePlayers: typeof ctx._prevActivePlayers = [];
   let _nextActivePlayers: ActivePlayersArg | null = null;