From 0cc8a1f29af00bce92193b9d947cd8c504da192b Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Sat, 26 Nov 2022 16:22:35 +0100
Subject: [PATCH] FSDJump is also an instance change for combat zones

---
 EDPlayerJournal/BGS/TransactionParser.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/EDPlayerJournal/BGS/TransactionParser.cs b/EDPlayerJournal/BGS/TransactionParser.cs
index 317a7ca..d53b5b5 100644
--- a/EDPlayerJournal/BGS/TransactionParser.cs
+++ b/EDPlayerJournal/BGS/TransactionParser.cs
@@ -224,6 +224,12 @@ internal class FSDJumpParser : TransactionParserPart {
             throw new InvalidJournalEntryException();
         }
 
+        // If you FSD jump straight out of the combat zone into a different system
+        // then the combat zone will be placed in the wrong system otherwise.
+        // This call needs to be *before* changing the current system.
+        context.DiscernCombatZone(transactions, e);
+        context.ResetCombatZone();
+
         context.CurrentSystem = entry.StarSystem;
         context.CurrentSystemAddress = entry.SystemAddress;