From ea705bc61c0da7e2451fb283016a0213588e75b8 Mon Sep 17 00:00:00 2001
From: Mike Bloy <mike@bloy.org>
Date: Sat, 21 Feb 2026 16:25:53 -0600
Subject: [PATCH] summons now follow their summoner

---
 CHANGELOG.md                       |  6 ++++++
 src/module.json                    |  2 +-
 src/module/powers/summonSupport.js | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99c9252..3b09152 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.2.1]
+
+### Added
+
+- Summoned creatures will now automatically follow their summoners in the combat tracker.
+
 ## [4.2.0]
 
 ### Added
diff --git a/src/module.json b/src/module.json
index 103d8dc..5540c32 100644
--- a/src/module.json
+++ b/src/module.json
@@ -9,7 +9,7 @@
     }
   ],
   "url": "https://git.bloy.org/foundryvtt/swade-mb-helpers",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "compatibility": {
     "minimum": "13",
     "verified": "13"
diff --git a/src/module/powers/summonSupport.js b/src/module/powers/summonSupport.js
index a68dfe1..6cc3575 100644
--- a/src/module/powers/summonSupport.js
+++ b/src/module/powers/summonSupport.js
@@ -18,6 +18,19 @@ export class BaseSummonEffect extends ActorFolderEffect {
     return 0;
   }
 
+  get spawnUpdates() {
+    const updates = super.spawnUpdates;
+    const actorUpdates = {
+      system: {
+        initiative: {
+          follow: this.source.name,
+        },
+      },
+    };
+    foundry.utils.mergeObject(updates.actor, actorUpdates);
+    return updates;
+  }
+
   async parseValuesPre() {}
 
   async parseValuesMid() {}