From f855efcc690eefe0227f4bdd38eac0d139975135 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Tue, 24 Oct 2023 19:20:47 +0200
Subject: [PATCH] Treat Player as object in the same cell

---
 ESMify_Plugins.pas | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ESMify_Plugins.pas b/ESMify_Plugins.pas
index 290586e..c02b101 100644
--- a/ESMify_Plugins.pas
+++ b/ESMify_Plugins.pas
@@ -209,10 +209,13 @@ begin
 			end
 			else if (packageLoc = 'Near linked reference') then begin
 				linkedRefKeyword := LinksTo(ElementByPath(inputVal, 'PLDT\Keyword'));
+				if FormID(linkedRefKeyword) = $14 then continue;
 				if not IsLinkedRefRemote(e, linkedRefKeyword) then continue;
 			end
 			else if (packageLoc = 'Near reference') then begin
-				if InSameCell(e, LinksTo(ElementByPath(inputVal, 'PLDT\Reference'))) then continue;
+				linkedRef := LinksTo(ElementByPath(inputVal, 'PLDT\Reference'));
+				if FormID(linkedRef) = $14 then continue;
+				if InSameCell(e, linkedRef) then continue;
 			end;
 			
 		end
@@ -221,10 +224,12 @@ begin
 
 			if (packageLoc = 'Linked Reference') then begin
 				linkedRefKeyword := LinksTo(ElementByPath(inputVal, 'PTDA\Target Data\Reference'));
+				if FormID(linkedRefKeyword) = $14 then continue;
 				if not IsLinkedRefRemote(e, linkedRefKeyword) then continue;
 			end
 			else if (packageLoc = 'Specific Reference') then begin
 				linkedRef := LinksTo(ElementByPath(inputVal, 'PTDA\Target Data\Reference'));
+				if FormID(linkedRef) = $14 then continue;
 				if InSameCell(e, linkedRef) then continue;
 			end
 			else continue;
@@ -377,7 +382,7 @@ begin
 		
 		if ReferencedByCount(actorLocation) > 1 then begin
 			Inc(persLocSkipped);
-			AddMessage('   Skipping actor with Persistent Location: ' + GetElementEditValues(e, 'NAME') + ' - (' + Name(e) + ')');
+			//AddMessage('   Skipping actor with Persistent Location: ' + GetElementEditValues(e, 'NAME') + ' - (' + Name(e) + ')');
 			exit;
 		end;
 	end;