Use WorldComp.trading instead of WorldComp.sessionManager

Source/Client/Comp/Map/MultiplayerMapComp.cs

@@ -224,12 +224,9 @@ static void Prefix()
             if (Multiplayer.Client == null) return;
 
             // Trading window on resume save
-            if (!Multiplayer.WorldComp.sessionManager.AnySessionActive) return;
+            if (!Multiplayer.WorldComp.trading.NullOrEmpty()) return;
             // playerNegotiator == null can only happen during loading? Is this a resuming check?
-            Multiplayer.WorldComp.sessionManager.AllSessions
-                .OfType<MpTradeSession>()
-                .FirstOrDefault(t => t.playerNegotiator == null)
-                ?.OpenWindow();
+            Multiplayer.WorldComp.trading.FirstOrDefault(t => t.playerNegotiator == null)?.OpenWindow();
         }
     }
 
@@ -243,7 +240,7 @@ static void Prefix(WorldInterface __instance)
             if (Find.World.renderer.wantedMode == WorldRenderMode.Planet)
             {
                 // Hide trading window for map trades
-                if (Multiplayer.WorldComp.sessionManager.AllSessions.OfType<MpTradeSession>().All(t => t.playerNegotiator?.Map != null))
+                if (Multiplayer.WorldComp.trading.All(t => t.playerNegotiator?.Map != null))
                 {
                     if (Find.WindowStack.IsOpen(typeof(TradingWindow)))
                         Find.WindowStack.TryRemove(typeof(TradingWindow), doCloseSound: false);

Source/Client/Comp/World/MultiplayerWorldComp.cs

@@ -154,30 +154,30 @@ public void SetFaction(Faction faction)
     public void DirtyColonyTradeForMap(Map map)
     {
         if (map == null) return;
-        foreach (MpTradeSession session in sessionManager.AllSessions.OfType<MpTradeSession>())
+        foreach (MpTradeSession session in trading)
             if (session.playerNegotiator.Map == map)
                 session.deal.recacheColony = true;
     }
 
     public void DirtyTraderTradeForTrader(ITrader trader)
     {
         if (trader == null) return;
-        foreach (MpTradeSession session in sessionManager.AllSessions.OfType<MpTradeSession>())
+        foreach (MpTradeSession session in trading)
             if (session.trader == trader)
                 session.deal.recacheTrader = true;
     }
 
     public void DirtyTradeForSpawnedThing(Thing t)
     {
         if (t is not { Spawned: true }) return;
-        foreach (MpTradeSession session in sessionManager.AllSessions.OfType<MpTradeSession>())
+        foreach (MpTradeSession session in trading)
             if (session.playerNegotiator.Map == t.Map)
                 session.deal.recacheThings.Add(t);
     }
 
     public bool AnyTradeSessionsOnMap(Map map)
     {
-        foreach (MpTradeSession session in trading.OfType<MpTradeSession>())
+        foreach (MpTradeSession session in trading)
             if (session.playerNegotiator.Map == map)
                 return true;
         return false;

Source/Client/Patches/Patches.cs

@@ -488,7 +488,7 @@ internal static void SyncDialogOptionByIndex(int position)
                     if (!option.resolveTree) SyncUtil.isDialogNodeTreeOpen = true; // In case dialog is still open, we mark it as such
 
                     // Try opening the trading menu if the picked option was supposed to do so (caravan meeting, trading option)
-                    if (Multiplayer.Client != null && Multiplayer.WorldComp.sessionManager.AllSessions.OfType<MpTradeSession>().Any(t => t.trader is Caravan))
+                    if (Multiplayer.Client != null && Multiplayer.WorldComp.trading.Any(t => t.trader is Caravan))
                         Find.WindowStack.Add(new TradingWindow());
                 }
                 else SyncUtil.isDialogNodeTreeOpen = false;