Move "pf2e.restForTheNight" hook back to rest function (#12889)

foundryvtt · Jan 9, 2024 · 7b03664 · 7b03664
1 parent 4822163
commit 7b03664
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/module/chat-message/document.ts b/src/module/chat-message/document.ts
@@ -274,12 +274,8 @@ class ChatMessagePF2e extends ChatMessage {
             CriticalHitAndFumbleCards.handleDraw(this);
         }
 
-        // If this is a rest notification, re-render sheet for anyone currently viewing it and call system hook
-        if (options.restForTheNight) {
-            const actor = this.actor;
-            actor?.render();
-            Hooks.callAll("pf2e.restForTheNight", actor);
-        }
+        // If this is a rest notification, re-render sheet for anyone currently viewing it
+        if (options.restForTheNight) this.actor?.render();
     }
 }
 

diff --git a/src/scripts/macros/rest-for-the-night.ts b/src/scripts/macros/rest-for-the-night.ts
@@ -204,6 +204,8 @@ export async function restForTheNight(options: RestForTheNightOptions): Promise<
         );
         const content = [actorAwakens, recoveryList.outerHTML].join("\n");
 
+        // Call a hook for modules to do anything extra
+        Hooks.callAll("pf2e.restForTheNight", actor);
         messages.push({ user: game.user.id, content, speaker: ChatMessagePF2e.getSpeaker({ actor }) });
     }