From 8da60f2d9850ea24f96549bbd598ac3def474ab3 Mon Sep 17 00:00:00 2001
From: ifBars <tristens5465@gmail.com>
Date: Wed, 14 Oct 2026 23:44:28 -0700
Subject: [PATCH] fix(npc): restore unlocked supplier message entries after
 loading

---
 S1API/Entities/NPCSupplier.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/S1API/Entities/NPCSupplier.cs b/S1API/Entities/NPCSupplier.cs
index d2fef09c..75566508 100644
--- a/S1API/Entities/NPCSupplier.cs
+++ b/S1API/Entities/NPCSupplier.cs
@@ -150,12 +150,12 @@ internal void EnsureSupplier()
                 return;
             }
 
-            // Native suppliers keep a conversation object for persistence and
-            // networking, but do not add it to Messages until SupplierUnlocked.
+            npc.EnsureMessageConversationReady(resetDefaults: false);
+            // Saved unlocks can be restored before Supplier.Start subscribes to OnUnlocked.
+            // Reconcile the phone entry from that state even when no message history was saved.
             npc.SetConversationCategory(
                 S1Messaging.EConversationCategory.Supplier,
-                ensureUi: false);
-            npc.EnsureMessageConversationReady(resetDefaults: false);
+                ensureUi: npc.Relationship.IsUnlocked);
             EnsureDeadDropReadyDispatcher();
         }