From b08b8b93b655027ea7f597e55cb8e7202febe91c Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Wed, 15 Apr 2026 18:25:36 +0200
Subject: [PATCH] Fixed onCreate and preDelete

---
 module/data/actor/party.mjs | 13 +++++++------
 module/documents/actor.mjs  |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/data/actor/party.mjs b/module/data/actor/party.mjs
index 4fa295ef..ba39b7e5 100644
--- a/module/data/actor/party.mjs
+++ b/module/data/actor/party.mjs
@@ -48,13 +48,14 @@ export default class DhParty extends BaseDataActor {
         }
     }
 
-    /**@inheritdoc */
-    async _preCreate(data, options, user) {
-        const allowed = await super._preCreate(data, options, user);
-        if (allowed === false) return;
+    _onCreate(data, options, userId) {
+        super._onCreate(data, options, userId);
 
-        if (!game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.ActiveParty)) 
-            game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.ActiveParty, this.parent.id);
+        if (game.user.isActiveGM && !game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.ActiveParty)) {
+            game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.ActiveParty, this.parent.id).then(_ => {
+                ui.actors.render();
+            });
+        }
     }
 
     async _preDelete() {
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 48f2f171..d578a481 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -125,6 +125,8 @@ export default class DhpActor extends Actor {
                 game.system.registeredTriggers.unregisterItemTriggers(token.actor.items);
             }
         }
+
+        if(this.system._preDelete() === false) return false;
     }
 
     _onDelete(options, userId) {