1 files changed, 11 insertions, 7 deletions

diff --git a/rules.js b/rules.js
index a7aa0de..d1a5f2e 100644
--- a/rules.js
+++ b/rules.js
@@ -305,8 +305,12 @@ function flush_summary(text, add_plural_s=false) {
 	delete game.summary;
 }
 
+function is_active_player(current) {
+	return (game.active === current) || (Array.isArray(game.active) && game.active.includes(current))
+}
+
 function is_inactive_player(current) {
-	return current === "Observer" || (game.active !== current && game.active !== "Both");
+	return !is_active_player(current)
 }
 
 function you_may_play(current, list) {
@@ -662,11 +666,11 @@ function goto_hand_size() {
 		game.us.queue = [];
 
 	if (game.tr.queue && game.us.queue)
-		game.active = "Both";
+		game.active = [ TR, US ];
 	else if (game.tr.queue)
-		game.active = TR;
+		game.active = [ TR ];
 	else if (game.us.queue)
-		game.active = US;
+		game.active = [ US ];
 	else
 		goto_american_play();
 }
@@ -745,11 +749,11 @@ states.hand_size = {
 			delete game.us.queue;
 		}
 		if (game.tr.queue && game.us.queue)
-			game.active = "Both";
+			game.active = [ TR, US ];
 		else if (game.tr.queue)
-			game.active = TR;
+			game.active = [ TR ];
 		else if (game.us.queue)
-			game.active = US;
+			game.active = [ US ];
 		else
 			goto_american_play();
 	},