From a193593fa5ca539b8e6a126a63df2c73a29c308a Mon Sep 17 00:00:00 2001
From: Jeremy Scheff <jdscheff@gmail.com>
Date: Mon, 8 Apr 2024 10:58:04 -0400
Subject: [PATCH] Fix

---
 TODO                              | 1 -
 src/common/allowForceTie.ts       | 6 +++---
 src/worker/core/season/hasTies.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 0011c36d21..88b951027c 100644
--- a/TODO
+++ b/TODO
@@ -23,7 +23,6 @@ shootouts
   - make sure game-tying shots are logged as clutch right before a shootout
     - might need to call checkGameTyingShot again
 - make sure it works for player feats - see PlayerFeats.tsx "const result" - needs shootout info
-- force tie should not be an option if shootout will happen this game
 - upgrades
   - league file import
   - idb upgrade
diff --git a/src/common/allowForceTie.ts b/src/common/allowForceTie.ts
index 32827a7f0c..79d24d0669 100644
--- a/src/common/allowForceTie.ts
+++ b/src/common/allowForceTie.ts
@@ -27,12 +27,12 @@ const allowForceTie = ({
 	}
 
 	if (isSport("basketball")) {
-		if (elam) {
+		const isAllStarGame = homeTid === -1 && awayTid === -2;
+
+		if (!isAllStarGame && elam) {
 			return false;
 		}
 
-		const isAllStarGame = homeTid === -1 && awayTid === -2;
-
 		if (isAllStarGame && elamASG) {
 			return false;
 		}
diff --git a/src/worker/core/season/hasTies.ts b/src/worker/core/season/hasTies.ts
index b34334a7ca..c80f9711e0 100644
--- a/src/worker/core/season/hasTies.ts
+++ b/src/worker/core/season/hasTies.ts
@@ -4,7 +4,7 @@ import { g } from "../../util";
 const hasTies = (season: number | "current") => {
 	return (
 		g.get("maxOvertimes", season) !== null &&
-		g.get("shootoutRounds", season) === null
+		g.get("shootoutRounds", season) <= 0
 	);
 };