From e4fc1e10553a42c56ea5b35d8c5bac484aa20d9a Mon Sep 17 00:00:00 2001
From: John Nolan <me@johnnolan.dev>
Date: Sat, 21 Oct 2023 11:44:12 +0100
Subject: [PATCH] Replace deprecated Roll with Rolls (#628)

Fixes #626
---
 scripts/SetupHooksPF2e.ts | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/scripts/SetupHooksPF2e.ts b/scripts/SetupHooksPF2e.ts
index 6f0872a5..53a4c3ef 100644
--- a/scripts/SetupHooksPF2e.ts
+++ b/scripts/SetupHooksPF2e.ts
@@ -34,19 +34,19 @@ export default class SetupHooksPF2e {
               return;
             }
           }
+          const firstChatRoll = chatMessagePF2e.rolls[0];
 
           if (chatType === "attack-roll" || chatType === "spell-attack-roll") {
             const workflow = await PF2e.ParseHook(
               chatMessagePF2e.item,
               chatMessagePF2e.actor,
               CombatDetailType.Attack,
-              chatMessagePF2e.roll,
+              firstChatRoll,
             );
             OnEncounterWorkflowComplete(workflow, ChatType.PF2e);
             OnTrackRollStreak(
-              chatMessagePF2e.roll?.terms[0]?.results?.find(
-                (f) => f.active === true,
-              ).result ?? 0,
+              firstChatRoll?.terms[0]?.results?.find((f) => f.active === true)
+                .result ?? 0,
               chatMessagePF2e.token.name,
               chatMessagePF2e.actor.id,
               chatRollMode,
@@ -57,22 +57,20 @@ export default class SetupHooksPF2e {
               chatMessagePF2e.item,
               chatMessagePF2e.item.actor,
               CombatDetailType.Damage,
-              chatMessagePF2e.roll,
+              firstChatRoll,
             );
             OnEncounterWorkflowComplete(workflow, ChatType.PF2e);
           }
           if (chatType === "saving-throw" || chatType.indexOf("-check") > 0) {
             OnTrackDiceRoll(
-              chatMessagePF2e.roll?.terms[0]?.results?.find(
-                (f) => f.active === true,
-              ).result ?? 0,
+              firstChatRoll?.terms[0]?.results?.find((f) => f.active === true)
+                .result ?? 0,
               chatMessagePF2e.actor.name,
               chatMessagePF2e?.flags?.pf2e?.modifierName,
             );
             OnTrackRollStreak(
-              chatMessagePF2e.roll?.terms[0]?.results?.find(
-                (f) => f.active === true,
-              ).result ?? 0,
+              firstChatRoll?.terms[0]?.results?.find((f) => f.active === true)
+                .result ?? 0,
               chatMessagePF2e.token.name,
               chatMessagePF2e.actor.id,
               chatRollMode,