Merge pull request #281 from ari-steas/QuestLogNetworking

Tentative fix for persistent questlogs on faction leave/join
StarCoreSE · Dec 7, 2024 · 09d51f8 · 09d51f8
2 parents 7bf6961 + 61ba60d
commit 09d51f8
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/DeltaVFactionQuestLog/Data/Scripts/DeltaVQuestLog/PersistentFactionObjectives.cs b/DeltaVFactionQuestLog/Data/Scripts/DeltaVQuestLog/PersistentFactionObjectives.cs
@@ -5,6 +5,7 @@
 using Sandbox.ModAPI;
 using VRage.Game;
 using VRage.Game.Components;
+using VRage.Game.ModAPI;
 using VRage.Utils;
 
 namespace Invalid.DeltaVQuestLog
@@ -38,13 +39,26 @@ public override void LoadData()
 
             if (isServer)
             {
+                MyAPIGateway.Session.Factions.FactionStateChanged += FactionsOnFactionStateChanged;
                 MyVisualScriptLogicProvider.PlayerConnected += OnPlayerConnected;
             }
 
             CommandHandler.Init();
             Networking = new QuestLogNetworking();
         }
 
+        private void FactionsOnFactionStateChanged(MyFactionStateChange action, long fromFactionId, long toFactionId, long playerId, long senderId)
+        {
+            if (action == MyFactionStateChange.FactionMemberAcceptJoin)
+            {
+                GetFactionManger(fromFactionId)?.SendNetworkUpdate();
+            }
+            if (action == MyFactionStateChange.FactionMemberLeave || action == MyFactionStateChange.FactionMemberKick)
+            {
+                MyVisualScriptLogicProvider.SetQuestlog(false, "", playerId);
+            }
+        }
+
         protected override void UnloadData()
         {
             Networking.Close();
@@ -54,6 +68,7 @@ protected override void UnloadData()
             {
                 SaveObjectives();
                 MyVisualScriptLogicProvider.PlayerConnected -= OnPlayerConnected;
+                MyAPIGateway.Session.Factions.FactionStateChanged -= FactionsOnFactionStateChanged;
             }
 
             I = null;
@@ -70,15 +85,6 @@ public override void UpdateAfterSimulation()
                     manager.Update10();
         }
 
-        public override void BeforeStart()
-        {
-            if (MyAPIGateway.Session.Player == null)
-                return;
-
-            if (MyAPIGateway.Session.Factions.TryGetPlayerFaction(MyAPIGateway.Session.Player.IdentityId) == null)
-                MyVisualScriptLogicProvider.RemoveQuestlogDetails(MyAPIGateway.Session.Player.IdentityId);
-        }
-
         private void OnPlayerConnected(long playerId)
         {
             if (!isServer) return;
@@ -87,6 +93,7 @@ private void OnPlayerConnected(long playerId)
             if (playerFaction == null) return;
 
             var factionId = playerFaction.FactionId;
+            MyVisualScriptLogicProvider.SetQuestlog(false, "", playerId);
             GetFactionManger(factionId)?.SendNetworkUpdate();
         }