From f5dd86dc9c8ec0e6f252d4a19c0ce839ca641631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?=
 <lilian.jonsdottir@gmail.com>
Date: Mon, 17 Aug 2020 00:07:37 -0700
Subject: [PATCH] build follower list on load, cellchange and timer

---
 MWSE/mods/celediel/NPCsGoHome/main.lua | 27 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/MWSE/mods/celediel/NPCsGoHome/main.lua b/MWSE/mods/celediel/NPCsGoHome/main.lua
index e3f1ed9..b9ff1c8 100644
--- a/MWSE/mods/celediel/NPCsGoHome/main.lua
+++ b/MWSE/mods/celediel/NPCsGoHome/main.lua
@@ -103,6 +103,18 @@ local function getFightFromSpawnedReference(id)
     return fight
 end
 
+local function buildFollowerList()
+    local f = {}
+    -- build our followers list
+    for friend in tes3.iterate(tes3.mobilePlayer.friendlyActors) do
+        if friend ~= tes3.player then -- ? why is the player friendly towards the player ?
+            f[friend.object.id] = true
+            log(common.logLevels.large, "%s is follower", friend.object.id)
+        end
+    end
+    return f
+end
+
 -- {{{ npc evaluators
 
 -- NPCs barter gold + value of all inventory items
@@ -856,16 +868,6 @@ end
 local function applyChanges(cell)
     if not cell then cell = tes3.getPlayerCell() end
 
-    -- build our followers list
-    for friend in tes3.iterate(tes3.mobilePlayer.friendlyActors) do
-        local obj = friend.baseObject and friend.baseObject or friend.object
-
-        if friend ~= tes3.mobilePlayer then
-            followers[obj.id] = true
-            -- log(common.logLevels.large, "%s is follower", obj.id)
-        end
-    end
-
     if isIgnoredCell(cell) then return end
 
     -- Interior cell, except Canton cells, don't do anything
@@ -886,6 +888,8 @@ end
 local function updateCells()
     log(common.logLevels.medium, "Updating active cells!")
 
+    followers = buildFollowerList()
+
     for _, cell in pairs(tes3.getActiveCells()) do
         log(common.logLevels.large, "Applying changes to cell %s", cell.id)
         applyChanges(cell)
@@ -929,6 +933,8 @@ local function onLoaded()
     -- movedNPCs = tes3.player.data.NPCsGoHome.movedNPCs or {}
     if tes3.player.cell then searchCellsForNPCs() end
 
+    followers = buildFollowerList()
+
     if not updateTimer or (updateTimer and updateTimer.state ~= timer.active) then
         updateTimer = timer.start({
             type = timer.simulate,
@@ -941,6 +947,7 @@ end
 
 local function onCellChanged(e)
     updateCells()
+    followers = buildFollowerList()
     updatePlayerTrespass(e.cell, e.previousCell)
     checkEnteredNPCHome(e.cell)
     if e.cell.name then -- exterior wilderness cells don't have name