Fix incorrect condition theme on initial load (#8635)

foundryvtt · Jul 10, 2023 · 16d650a · 16d650a
1 parent 06e77fe
commit 16d650a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/module/canvas/status-effects.ts b/src/module/canvas/status-effects.ts
@@ -24,14 +24,6 @@ export class StatusEffects {
  };
 
  /** Set the theme for condition icons on tokens */
- static setIconTheme(): void {
- const iconTheme = game.settings.get("pf2e", "statusEffectType");
- CONFIG.PF2E.statusEffects.lastIconTheme = iconTheme;
- CONFIG.PF2E.statusEffects.iconDir = this.#ICON_THEME_DIRS[iconTheme];
- this.#updateStatusIcons();
- }
-
- /** Link status effect icons to conditions */
  static initialize(): void {
  const iconTheme = game.settings.get("pf2e", "statusEffectType");
  CONFIG.PF2E.statusEffects.lastIconTheme = iconTheme;

diff --git a/src/scripts/hooks/init.ts b/src/scripts/hooks/init.ts
@@ -169,6 +169,8 @@ export const Init = {
  element.setAttribute("disabled", "");
  }
  }
+
+ game.pf2e.StatusEffects.initialize();
  });
  },
 };
diff --git a/src/scripts/hooks/setup.ts b/src/scripts/hooks/setup.ts
@@ -10,7 +10,6 @@ export const Setup = {
  registerSheets();
 
  CONFIG.controlIcons.defeated = game.settings.get("pf2e", "deathIcon");
- game.pf2e.StatusEffects.initialize();
 
  // Assign the homebrew elements to their respective `CONFIG.PF2E` objects
  const homebrew = new HomebrewElements();