From 049b46e3cc2d5f41c8bd330ef8964e8d67d0fa97 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Mon, 29 Mar 2021 19:44:21 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20ActiveEffect=20demi-r=C3=AAve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

L'ActiveEffect demi-rêve n'était plus supprimé
---
 module/actor.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 56a4f06d..7b09ba3f 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -3063,7 +3063,8 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   enleverTousLesEffets() {
-    this.deleteEmbeddedEntity('ActiveEffect', Array.from(this.effects?.keys() ?? []));
+    const ids = Array.from(this.effects?.keys() ?? []);
+    this.deleteEmbeddedDocuments('ActiveEffect', ids);
   }
 
   /* -------------------------------------------- */
@@ -3102,41 +3103,37 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  deleteStatusEffectById(id, options = { renderSheet: true }) {
+  deleteStatusEffectById(id) {
     const effects = Array.from(this.effects?.values())
       .filter(it => it.data.flags.core?.statusId == id);
-    this._deleteStatusEffects(effects, options);
+    this._deleteStatusEffects(effects);
   }
 
   /* -------------------------------------------- */
-  deleteStatusEffect(effect, options = { renderSheet: true }) {
+  deleteStatusEffect(effect) {
     const toDelete = Array.from(this.effects?.values())
       .filter(it => StatusEffects.statusId(it.data) == StatusEffects.statusId(effect));
-    this._deleteStatusEffects(toDelete, options);
+    this._deleteStatusEffects(toDelete);
   }
 
   /* -------------------------------------------- */
-  _deleteStatusEffects(effects, options) {
-    this._deleteStatusEffectsByIds(effects.map(it => it.id), options);
+  _deleteStatusEffects(effects) {
+    const ids = effects.map(it => it.id);
+    this.deleteEmbeddedDocuments('ActiveEffect', ids);
   }
 
   /* -------------------------------------------- */
-  _deleteStatusEffectsByIds(effectIds, options) {
-    this.deleteEmbeddedDocuments('ActiveEffect', [effectIds], options);
-  }
-
-  /* -------------------------------------------- */
-  async addStatusEffectById(id, options = { renderSheet: false }) {
+  async addStatusEffectById(id) {
     const statusEffect = CONFIG.statusEffects.find(it => it.id == id);
-    await this.addStatusEffect(statusEffect, options);
+    await this.addStatusEffect(statusEffect);
   }
 
   /* -------------------------------------------- */
-  async addStatusEffect(statusEffect, options = { renderSheet: false }) {
-    this.deleteStatusEffectById(statusEffect.id, options);
+  async addStatusEffect(statusEffect) {
+    this.deleteStatusEffectById(statusEffect.id);
     const effet = duplicate(statusEffect);
     effet["flags.core.statusId"] = effet.id;
-    await this.createEmbeddedEntity('ActiveEffect', effet, options);
+    await this.createEmbeddedDocuments('ActiveEffect', [effet]);
   }
 
   /* -------------------------------------------- */