Merge branch 'fix-allow-AE-to-change-status-effects-on-create-delete-…

…' into feat-add-Cepheus-Universal-Support
xdy · Sep 18, 2024 · 8c4d6ec · 8c4d6ec
2 parents 01a28cc + 7620118
commit 8c4d6ec
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/module/entities/TwodsixActiveEffect.ts b/src/module/entities/TwodsixActiveEffect.ts
@@ -60,13 +60,15 @@ export class TwodsixActiveEffect extends ActiveEffect {
 }
 
 async function checkEncumbranceStatus (activeEffect:TwodsixActiveEffect):void {
-  if (activeEffect.statuses.size === 0) {
-    await applyEncumberedEffect(activeEffect.parent);
-  } else {
-    const notEncumbered= !activeEffect.statuses.has('encumbered');
-    const notWounded = !activeEffect.statuses.has('wounded');
-    if (notEncumbered && notWounded) {
+  if (game.settings.get('twodsix', 'useEncumbranceStatusIndicators')) {
+    if (activeEffect.statuses.size === 0) {
       await applyEncumberedEffect(activeEffect.parent);
+    } else {
+      const notEncumbered= !activeEffect.statuses.has('encumbered');
+      const notWounded = !activeEffect.statuses.has('wounded');
+      if (notEncumbered && notWounded) {
+        await applyEncumberedEffect(activeEffect.parent);
+      }
     }
   }
 }