Make sure that SystemDetails() takes full advantage of the live game state before falling back to stored or 3rd party data. Don't set the destination system to be the current star system before we arrive.

Tkael · Tkael · commit 08707e1f2d51 · 2026-05-29T00:15:11.000-07:00
diff --git a/DataProviderService/DataProviderService.cs b/DataProviderService/DataProviderService.cs
@@ -555,7 +555,9 @@ private static void PreserveFactionProperties ( StarSystem updatedSystem, StarSy
             {
                 foreach ( var updatedFaction in updatedSystem.factions )
                 {
-                    if ( updatedFaction.name == oldFaction.name )
+                    // Only preserve reputation data if the faction name matches and the updated faction does not include reputation data
+                    // (to avoid overwriting reputation data obtained from the journal)
+                    if ( updatedFaction.name == oldFaction.name && updatedFaction.myreputation is null )
                     {
                         updatedFaction.myreputation = oldFaction.myreputation;
                     }
diff --git a/EddiCore/EDDI.cs b/EddiCore/EDDI.cs
@@ -1341,60 +1341,14 @@ private async Task<bool> eventCarrierJumpedAsync( CarrierJumpedEvent @event )
                 // Update our system properties
                 if ( CurrentStarSystem is null ) { return false; }
 
-                CurrentStarSystem.x = @event.x;
-                CurrentStarSystem.y = @event.y;
-                CurrentStarSystem.z = @event.z;
-
-                // Update Thargoid war data, when available
-                CurrentStarSystem.ThargoidWar = @event.ThargoidWar;
+                await ApplyCurrentSystemSnapshotAsync( CurrentStarSystem, @event.systemname, @event.systemAddress, @event.x, @event.y, @event.z, @event.controllingsystemfaction, @event.factions, @event.conflicts, @event.systemEconomy, @event.systemEconomy2, @event.securityLevel, @event.population, @event.Power, @event.NearbyPowers, @event.PowerState, @event.powerAcquisitionProgress, @event.powerControlProgress, @event.powerReinforcementControlPoints, @event.powerUnderminingControlPoints, @event.ThargoidWar, @event.timestamp, true ).ConfigureAwait(false);
 
                 if ( CurrentStation != null )
                 {
                     // Add our carrier to the new current star system
                     CurrentStarSystem.AddOrUpdateStation( CurrentStation );
                 }
 
-                // Update the mutable system data from the journal
-                if ( @event.population != null )
-                {
-                    CurrentStarSystem.population = @event.population;
-                    CurrentStarSystem.Economies = [ @event.systemEconomy, @event.systemEconomy2 ];
-                    CurrentStarSystem.securityLevel = @event.securityLevel;
-                    CurrentStarSystem.Faction = @event.controllingsystemfaction;
-                }
-
-                // Update system faction data if available
-                if ( @event.factions != null )
-                {
-                    CurrentStarSystem.factions = @event.factions;
-                    CurrentStarSystem.conflicts = @event.conflicts;
-
-                    // Update station controlling faction data
-                    foreach ( var station in CurrentStarSystem.stations )
-                    {
-                        var stationFaction = @event.factions
-                            .FirstOrDefault( f => f.name == station.Faction?.name );
-                        if ( stationFaction != null )
-                        {
-                            station.Faction = stationFaction;
-                        }
-                    }
-                }
-
-                // (When pledged) Powerplay information
-                CurrentStarSystem.Power = @event.Power;
-                CurrentStarSystem.NearbyPowers = @event.NearbyPowers;
-                CurrentStarSystem.powerState = @event.PowerState ?? CurrentStarSystem.powerState;
-                CurrentStarSystem.powerAcquisitionProgress = @event.powerAcquisitionProgress;
-                CurrentStarSystem.powerControlProgress = @event.powerControlProgress;
-                CurrentStarSystem.powerReinforcementControlPoints = @event.powerReinforcementControlPoints;
-                CurrentStarSystem.powerUnderminingControlPoints = @event.powerUnderminingControlPoints;
-
-                // Update to most recent information
-                CurrentStarSystem.visitLog.Add( @event.timestamp );
-                CurrentStarSystem.updatedat = Dates.fromDateTimeToSeconds( @event.timestamp );
-                await DataProvider.SaveStarSystemAsync( CurrentStarSystem ).ConfigureAwait(false);
-
                 // Kick off the profile refresh if the companion API is available
                 if (CompanionAppService.Instance.CurrentState == CompanionAppService.State.Authorized && carrierID != null)
                 {
@@ -1635,48 +1589,7 @@ internal async Task<bool> eventLocationAsync( LocationEvent theEvent )
             await updateCurrentSystemAsync( theEvent.systemname, theEvent.systemAddress ).ConfigureAwait(false);
             if ( CurrentStarSystem is null ) { return false; }
 
-            // Always update the current system with the current co-ordinates, just in case things have changed or coordinates are not yet known
-            CurrentStarSystem.x = theEvent.x;
-            CurrentStarSystem.y = theEvent.y;
-            CurrentStarSystem.z = theEvent.z;
-
-            // Update Thargoid war data, as applicable
-            CurrentStarSystem.ThargoidWar = theEvent.ThargoidWar;
-
-            // Update the mutable system data from the journal
-            if ( theEvent.population != null )
-            {
-                CurrentStarSystem.population = theEvent.population;
-                CurrentStarSystem.Economies = [ theEvent.Economy, theEvent.Economy2 ];
-                CurrentStarSystem.securityLevel = theEvent.securityLevel;
-                CurrentStarSystem.Faction = theEvent.controllingsystemfaction;
-            }
-
-            // Update system faction data if available
-            if ( theEvent.factions != null )
-            {
-                CurrentStarSystem.factions = theEvent.factions;
-                CurrentStarSystem.conflicts = theEvent.conflicts;
-
-                // Update station controlling faction data
-                foreach ( var station in CurrentStarSystem.stations )
-                {
-                    var stationFaction = theEvent.factions.FirstOrDefault( f => f.name == station?.Faction?.name );
-                    if ( stationFaction != null )
-                    {
-                        station.Faction = stationFaction;
-                    }
-                }
-            }
-
-            // (When pledged) Powerplay information
-            CurrentStarSystem.Power = theEvent.Power;
-            CurrentStarSystem.NearbyPowers = theEvent.NearbyPowers;
-            CurrentStarSystem.powerState = theEvent.PowerState ?? CurrentStarSystem.powerState;
-            CurrentStarSystem.powerAcquisitionProgress = theEvent.powerAcquisitionProgress;
-            CurrentStarSystem.powerControlProgress = theEvent.powerControlProgress;
-            CurrentStarSystem.powerReinforcementControlPoints = theEvent.powerReinforcementControlPoints;
-            CurrentStarSystem.powerUnderminingControlPoints = theEvent.powerUnderminingControlPoints;
+            await ApplyCurrentSystemSnapshotAsync( CurrentStarSystem, theEvent.systemname, theEvent.systemAddress, theEvent.x, theEvent.y, theEvent.z, theEvent.controllingsystemfaction, theEvent.factions, theEvent.conflicts, theEvent.Economy, theEvent.Economy2, theEvent.securityLevel, theEvent.population, theEvent.Power, theEvent.NearbyPowers, theEvent.PowerState, theEvent.powerAcquisitionProgress, theEvent.powerControlProgress, theEvent.powerReinforcementControlPoints, theEvent.powerUnderminingControlPoints, theEvent.ThargoidWar, theEvent.timestamp, true ).ConfigureAwait(false);
 
             if ( theEvent.docked )
             {
@@ -2070,6 +1983,82 @@ private async Task<bool> eventShipyardAsync(ShipyardEvent theEvent)
             return false;
         }
 
+        private async Task ApplyCurrentSystemSnapshotAsync (
+            StarSystem system,
+            string systemName,
+            ulong systemAddress,
+            decimal? x,
+            decimal? y,
+            decimal? z,
+            Faction controllingFaction,
+            List<Faction> factions,
+            List<Conflict> conflicts,
+            Economy economy,
+            Economy economy2,
+            SecurityLevel security,
+            long? population,
+            Power power,
+            List<Power> nearbyPowers,
+            PowerplayState powerState,
+            List<PowerAcquisitionProgress> acquisitionProgress,
+            decimal controlProgress,
+            int reinforcementPoints,
+            int underminingPoints,
+            ThargoidWar thargoidWar,
+            DateTime timestamp,
+            bool addVisit )
+        {
+            if ( system is null )
+            { return; }
+
+            system.systemname = systemName;
+            system.systemAddress = systemAddress;
+            system.x = x;
+            system.y = y;
+            system.z = z;
+
+            if ( factions != null )
+            {
+                system.factions = factions;
+                system.conflicts = conflicts;
+
+                // Make the controlling faction reference the same object as the factions list.
+                system.Faction = factions.FirstOrDefault( f => f.name == controllingFaction?.name )
+                                 ?? controllingFaction;
+            }
+            else
+            {
+                system.Faction = controllingFaction;
+                system.conflicts = conflicts;
+            }
+
+            system.ThargoidWar = thargoidWar;
+            system.Economies = [ economy, economy2 ];
+            system.securityLevel = security ?? SecurityLevel.None;
+
+            if ( population != null )
+            {
+                system.population = population;
+            }
+
+            system.Power = power;
+            system.NearbyPowers = nearbyPowers;
+            system.powerState = powerState ?? system.powerState;
+            system.powerAcquisitionProgress = acquisitionProgress;
+            system.powerControlProgress = controlProgress;
+            system.powerReinforcementControlPoints = reinforcementPoints;
+            system.powerUnderminingControlPoints = underminingPoints;
+
+            if ( addVisit )
+            {
+                system.visitLog.Add( timestamp );
+            }
+
+            system.updatedat = Dates.fromDateTimeToSeconds( timestamp );
+
+            await DataProvider.SaveStarSystemAsync( system ).ConfigureAwait( false );
+        }
+
         internal async Task updateCurrentSystemAsync([NotNull] string systemName, ulong systemAddress )
         {
             try
@@ -2151,10 +2140,12 @@ internal async Task<bool> eventFSDEngagedAsync( FSDEngagedEvent @event )
                 ? Constants.ENVIRONMENT_SUPERCRUISE 
                 : Constants.ENVIRONMENT_WITCH_SPACE;
 
-            // Set the destination system as the current star system
-            if ( @event.systemAddress != null )
+            // Set the destination system as the next star system
+            if ( @event.systemAddress != null && @event.systemAddress != NextStarSystem?.systemAddress )
             {
-                await updateCurrentSystemAsync( @event.systemname, (ulong)@event.systemAddress ).ConfigureAwait(false);
+                NextStarSystem = await DataProvider
+                    .GetOrCreateStarSystemAsync( (ulong)@event.systemAddress, @event.systemname )
+                    .ConfigureAwait( false );
             }
 
             // Remove information about the current station and stellar body 
@@ -2229,7 +2220,7 @@ internal async Task<bool> eventJumpedAsync( JumpedEvent theEvent )
                 Vehicle = Constants.VEHICLE_SHIP;
             }
 
-            if ( LastStarSystem?.systemAddress > 0 && LastStarSystem.systemAddress == theEvent.systemAddress )
+            if ( CurrentStarSystem?.systemAddress > 0 && CurrentStarSystem.systemAddress == theEvent.systemAddress )
             {
                 // Thargoid Hyperdiction
                 Logging.Info( $"Jump Interrupted: Hyperdicted in {theEvent.system}" );
@@ -2255,50 +2246,7 @@ internal async Task<bool> eventJumpedAsync( JumpedEvent theEvent )
 
             await updateCurrentSystemAsync( theEvent.system, theEvent.systemAddress ).ConfigureAwait(false);
             if ( CurrentStarSystem is null ) { return false; }
-            CurrentStarSystem.systemAddress = theEvent.systemAddress;
-            CurrentStarSystem.x = theEvent.x;
-            CurrentStarSystem.y = theEvent.y;
-            CurrentStarSystem.z = theEvent.z;
-            CurrentStarSystem.Faction = theEvent.controllingfaction;
-            CurrentStarSystem.conflicts = theEvent.conflicts;
-            CurrentStarSystem.ThargoidWar = theEvent.ThargoidWar;
-
-            // Update system faction data if available
-            if ( theEvent.factions != null )
-            {
-                CurrentStarSystem.factions = theEvent.factions;
-
-                // Update station controlling faction data
-                foreach ( var station in CurrentStarSystem.stations )
-                {
-                    var stationFaction = theEvent.factions.Find(f => f.name == station?.Faction?.name);
-                    if ( stationFaction != null )
-                    {
-                        station.Faction = stationFaction;
-                    }
-                }
-            }
-
-            CurrentStarSystem.Economies = [ theEvent.Economy, theEvent.Economy2 ];
-            CurrentStarSystem.securityLevel = theEvent.securityLevel;
-            if ( theEvent.population != null )
-            {
-                CurrentStarSystem.population = theEvent.population;
-            }
-
-            // Powerplay information
-            CurrentStarSystem.Power = theEvent.Power;
-            CurrentStarSystem.NearbyPowers = theEvent.NearbyPowers;
-            CurrentStarSystem.powerState = theEvent.PowerState;
-            CurrentStarSystem.powerAcquisitionProgress = theEvent.powerAcquisitionProgress;
-            CurrentStarSystem.powerControlProgress = theEvent.powerControlProgress;
-            CurrentStarSystem.powerReinforcementControlPoints = theEvent.powerReinforcementControlPoints;
-            CurrentStarSystem.powerUnderminingControlPoints = theEvent.powerUnderminingControlPoints;
-
-            // Update to most recent information
-            CurrentStarSystem.visitLog.Add( theEvent.timestamp );
-            CurrentStarSystem.updatedat = Dates.fromDateTimeToSeconds( theEvent.timestamp );
-            await DataProvider.SaveStarSystemAsync( CurrentStarSystem ).ConfigureAwait(false);
+            await ApplyCurrentSystemSnapshotAsync( CurrentStarSystem, theEvent.system, theEvent.systemAddress, theEvent.x, theEvent.y, theEvent.z, theEvent.controllingfaction, theEvent.factions, theEvent.conflicts, theEvent.Economy, theEvent.Economy2, theEvent.securityLevel, theEvent.population, theEvent.Power, theEvent.NearbyPowers, theEvent.PowerState, theEvent.powerAcquisitionProgress, theEvent.powerControlProgress, theEvent.powerReinforcementControlPoints, theEvent.powerUnderminingControlPoints, theEvent.ThargoidWar, theEvent.timestamp, true ).ConfigureAwait( false );
 
             return passEvent;
         }
diff --git a/SpeechResponder/CustomFunctions/SystemDetails.cs b/SpeechResponder/CustomFunctions/SystemDetails.cs
@@ -2,9 +2,11 @@
 using EddiConfigService;
 using EddiCore;
 using EddiDataDefinitions;
+using EddiNavigationService;
 using EddiSpeechResponder.ScriptResolverService;
 using JetBrains.Annotations;
 using System;
+using System.Linq;
 using System.Reflection;
 using Utilities;
 
@@ -26,13 +28,29 @@ public class SystemDetails : ICustomFunction
                 {
                     result = EDDI.Instance.GameState.CurrentStarSystem;
                 }
-                else if ( ulong.TryParse( values[ 0 ].AsString, out var systemAddress ) )
-                {
-                    result = EDDI.Instance.DataProvider.GetOrFetchStarSystemAsync( systemAddress, true, true ).GetAwaiter().GetResult();
-                }
                 else
                 {
-                    result = EDDI.Instance.DataProvider.GetOrFetchStarSystemAsync( values[ 0 ].AsString, true, true ).GetAwaiter().GetResult();
+                    var key = values[ 0 ].AsString;
+
+                    // First attempt to resolve the system from the live game state, then fall back to the data provider if that fails.
+                    // This allows us to resolve the current system even if it has not yet been added to the data provider.
+                    result = ResolveLiveSystemFirst( key );
+
+                    // If we didn't find a match in the live game state, try the data provider.
+                    if ( result is null && ulong.TryParse( key, out var systemAddress ) )
+                    {
+                        result = EDDI.Instance.DataProvider
+                            .GetOrFetchStarSystemAsync( systemAddress, true, true )
+                            .GetAwaiter()
+                            .GetResult();
+                    }
+                    else if ( result is null )
+                    {
+                        result = EDDI.Instance.DataProvider
+                            .GetOrFetchStarSystemAsync( key, true, true )
+                            .GetAwaiter()
+                            .GetResult();
+                    }
                 }
 
                 var commanderConfig = ConfigService.Instance.commanderConfiguration;
@@ -56,5 +74,34 @@ public class SystemDetails : ICustomFunction
                 return $"The SystemDetails function is used incorrectly. {e.Message}.";
             }
         }, 0, 1);
+
+        private static bool MatchesSystem ( StarSystem system, string key, ulong? systemAddress )
+        {
+            if ( system is null ) { return false; }
+
+            if ( systemAddress is > 0 && system.systemAddress == systemAddress )
+            {
+                return true;
+            }
+
+            return !string.IsNullOrEmpty( key ) && system.systemname.Equals( key, StringComparison.InvariantCultureIgnoreCase );
+        }
+
+        private static StarSystem ResolveLiveSystemFirst ( string key )
+        {
+            ulong.TryParse( key, out var parsedAddress );
+            ulong? systemAddress = parsedAddress > 0 ? parsedAddress : null;
+
+            var gameState = EDDI.Instance.GameState;
+
+            return new[]
+                {
+                    gameState.CurrentStarSystem,
+                    gameState.LastStarSystem,
+                    gameState.NextStarSystem,
+                    gameState.DestinationStarSystem,
+                    NavigationService.Instance.SearchStarSystem
+                }.FirstOrDefault( s => MatchesSystem( s, key, systemAddress ) );
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,9 @@ private static void PreserveFactionProperties ( StarSystem updatedSystem, StarSy`
`555`	`555`	`{`
`556`	`556`	`foreach ( var updatedFaction in updatedSystem.factions )`
`557`	`557`	`{`
`558`		`- if ( updatedFaction.name == oldFaction.name )`
	`558`	`+ // Only preserve reputation data if the faction name matches and the updated faction does not include reputation data`
	`559`	`+ // (to avoid overwriting reputation data obtained from the journal)`
	`560`	`+ if ( updatedFaction.name == oldFaction.name && updatedFaction.myreputation is null )`
`559`	`561`	`{`
`560`	`562`	`updatedFaction.myreputation = oldFaction.myreputation;`
`561`	`563`	`}`