Close #1937

moo-man · Apr 28, 2024 · 62e8642 · 62e8642
1 parent 7c3a42a
commit 62e8642
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/modules/actor/actor-wfrp4e.js b/modules/actor/actor-wfrp4e.js
@@ -67,12 +67,12 @@ export default class ActorWfrp4e extends WFRP4eDocumentMixin(Actor)
 
 
   async _onUpdate(data, options, user) {
-    if (game.user.id != user) {
+    await super._onUpdate(data, options, user);
+
+    if (game.user.id != user) 
+    {
       return
     }
-
-
-    await super._onUpdate(data, options, user);
     await Promise.all(this.runScripts("update", {data, options, user}))
     // this.system.checkSize();
   }

diff --git a/modules/actor/mixin.js b/modules/actor/mixin.js
@@ -55,11 +55,12 @@ const WFRP4eDocumentMixin = (cls) => class extends cls {
     }
 
     async _onUpdate(data, options, user) {
+        await super._onUpdate(data, options, user);
+
         if (game.user.id != user) {
             return;
         }
 
-        await super._onUpdate(data, options, user);
         let update = this.system.updateChecks(data, options, user)
         if (!foundry.utils.isEmpty(update)) {
             await this.update(update);

diff --git a/modules/item/item-wfrp4e.js b/modules/item/item-wfrp4e.js
@@ -65,12 +65,13 @@ export default class ItemWfrp4e extends WFRP4eDocumentMixin(Item)
 
   async _onUpdate(data, options, user)
   {
+    await super._onUpdate(data, options, user)
+
     if (game.user.id != user)
     {
         return;
     }
-    await super._onUpdate(data, options, user)
-
+
     if (hasProperty(data, "system.worn") || hasProperty(data, "system.equipped"))
     {
       await Promise.all(this.runScripts("equipToggle", {equipped : this.isEquipped}))

diff --git a/modules/system/opposed-test.js b/modules/system/opposed-test.js
@@ -430,7 +430,7 @@ export default class OpposedTest {
       let breakdown = this.result.breakdown;
       let accumulator = Number(breakdown.base);
 
-      string += `<p><strong>${game.i18n.localize("BREAKDOWN.AttackerBase")</strong>: ${breakdown.base}</p>`;
+      string += `<p><strong>${game.i18n.localize("BREAKDOWN.AttackerBase")}</strong>: ${breakdown.base}</p>`;
       if (breakdown.damaging) 
       {
         accumulator += Number(breakdown.damaging);