sonar

tailuge · Oct 24, 2023 · 78e5388 · 78e5388
1 parent f6bef7f
commit 78e5388
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/src/controller/rules/snooker.ts b/src/controller/rules/snooker.ts
@@ -24,25 +24,24 @@ export class Snooker extends NineBall implements Rules {
         this.respot(outcome)
       } else if (Outcome.onlyRedsPotted(outcome)) {
         this.previousPotRed = true
-      } else {
+      } else if (pots === 1) {
         // out of order colour pot gets respotted
-        if (pots === 1) {
-          const id = Outcome.pots(outcome)[0].id
-          const lesserBallOnTable =
-            id > 1 &&
-            this.container.table.balls
-              .filter((b) => b.id < id)
-              .filter((b) => b.id > 0)
-              .some((b) => b.onTable())
-          if (lesserBallOnTable) {
-            this.respot(outcome)
-          }
-        } else {
-          // multiple colour pots get respotted
+        const id = Outcome.pots(outcome)[0].id
+        const lesserBallOnTable =
+          id > 1 &&
+          this.container.table.balls
+            .filter((b) => b.id < id)
+            .filter((b) => b.id > 0)
+            .some((b) => b.onTable())
+        if (lesserBallOnTable) {
           this.respot(outcome)
         }
+      } else {
+        // multiple colour pots get respotted
+        this.respot(outcome)
       }
     }
+
     return super.update(outcome)
   }
 

diff --git a/test/rules/snooker.spec.ts b/test/rules/snooker.spec.ts
@@ -13,7 +13,6 @@ import { PlayShot } from "../../src/controller/playshot"
 import { Aim } from "../../src/controller/aim"
 import { PlaceBall } from "../../src/controller/placeball"
 import { Snooker } from "../../src/controller/rules/snooker"
-import { table } from "console"
 
 initDom()