Prevent exceptions in TurnStart Rules from breaking the gameplay.

civ-clone · May 6, 2023 · aecc184 · aecc184
1 parent 14324cb
commit aecc184
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/Events/Player/turn-start.js b/Events/Player/turn-start.js
diff --git a/Events/Player/turn-start.js.map b/Events/Player/turn-start.js.map
diff --git a/Events/Player/turn-start.ts b/Events/Player/turn-start.ts
@@ -25,7 +25,11 @@ export const getEvents: (
   [
     'player:turn-start',
     (player: Player): void => {
-      ruleRegistry.process(TurnStart, player);
+      try {
+        ruleRegistry.process(TurnStart, player);
+      } catch (e) {
+        console.error(e);
+      }
 
       const client = clientRegistry.getByPlayer(player);
 

diff --git a/Rules/World/built.ts b/Rules/World/built.ts
@@ -147,7 +147,7 @@ export const getRules: (
           (promise: Promise<void>, client: Client): Promise<void> =>
             promise.then(async () => {
               const player = client.player(),
-                 CivilizationChoice = await client.chooseFromList(
+                CivilizationChoice = await client.chooseFromList(
                   new ChoiceMeta(
                     civilizationRegistry.entries(),
                     'choose-civilization'