some guid event cleanup

baaron4 · Oct 28, 2024 · 0300c3d · 0300c3d
1 parent 0e635df
commit 0300c3d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 5 deletions.
diff --git a/GW2EIEvtcParser/EIData/Actors/Player.cs b/GW2EIEvtcParser/EIData/Actors/Player.cs
@@ -122,7 +122,7 @@ public IReadOnlyList<GenericSegment<string>> GetCommanderStates(ParsedEvtcLog lo
                     foreach (MarkerEvent markerEvent in markerEvents)
                     {
                         MarkerGUIDEvent marker = markerEvent.GUIDEvent;
-                        if (marker != null)
+                        if (marker.ContentID >= 0)
                         {
                             if (MarkerGUIDs.CommanderTagMarkersHexGUIDs.Contains(marker.HexContentGUID))
                             {

diff --git a/GW2EIEvtcParser/ParsedData/CombatData.cs b/GW2EIEvtcParser/ParsedData/CombatData.cs
@@ -1590,7 +1590,7 @@ internal EffectGUIDEvent GetEffectGUIDEvent(long effectID)
                 throw new EvtcCombatEventException("Missing GUID event for effect " + effectID);
             }
 #endif
-            return null;
+            return EffectGUIDEvent.DummyEffectGUID;
         }
 
         /// <summary>
@@ -1618,7 +1618,7 @@ internal MarkerGUIDEvent GetMarkerGUIDEvent(long markerID)
             {
                 return evt;
             }
-            return null;
+            return MarkerGUIDEvent.DummyMarkerGUID;
         }
 
         public IReadOnlyList<GliderEvent> GetGliderEvents(AgentItem src)

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/MetaDataEvents/EffectGUIDEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/MetaDataEvents/EffectGUIDEvent.cs
@@ -2,9 +2,14 @@
 {
     public class EffectGUIDEvent : IDToGUIDEvent
     {
+        internal static EffectGUIDEvent DummyEffectGUID = new EffectGUIDEvent();
         internal EffectGUIDEvent(CombatItem evtcItem) : base(evtcItem)
         {
         }
 
+        internal EffectGUIDEvent() : base()
+        {
+        }
+
     }
 }
diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/MetaDataEvents/IDToGUIDEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/MetaDataEvents/IDToGUIDEvent.cs
@@ -15,7 +15,11 @@ internal IDToGUIDEvent(CombatItem evtcItem) : base(evtcItem)
             (HexContentGUID, Base64ContentGUID) = UnpackGUID(evtcItem.SrcAgent, evtcItem.DstAgent);
             ContentID = evtcItem.SkillID;
         }
-
+        internal IDToGUIDEvent() : base()
+        {
+            (HexContentGUID, Base64ContentGUID) = ("", "");
+            ContentID = -1;
+        }
         internal static (string hex, string base64) UnpackGUID(ulong first8, ulong last8)
         {
             byte[] guid = new byte[16];

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/MetaDataEvents/MarkerGUIDEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/MetaDataEvents/MarkerGUIDEvent.cs
@@ -2,9 +2,13 @@
 {
     public class MarkerGUIDEvent : IDToGUIDEvent
     {
+        internal static MarkerGUIDEvent DummyMarkerGUID = new MarkerGUIDEvent();
         internal MarkerGUIDEvent(CombatItem evtcItem) : base(evtcItem)
         {
         }
+        internal MarkerGUIDEvent() : base()
+        {
+        }
 
     }
 }
diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/StatusEvents/EffectEvents/EffectEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/StatusEvents/EffectEvents/EffectEvent.cs
@@ -10,7 +10,9 @@ public abstract class EffectEvent : AbstractEffectEvent
         /// Id of the created visual effect. Match to stable GUID with <see cref="EffectGUIDEvent"/>.
         /// </summary>
         public long EffectID { get; }
-
+        /// <summary>
+        /// GUID event of the effect, can not be null
+        /// </summary>
         public EffectGUIDEvent GUIDEvent { get; private set; }
 
         /// <summary>

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/StatusEvents/MarkerEvents/MarkerEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/StatusEvents/MarkerEvents/MarkerEvent.cs
@@ -2,8 +2,17 @@
 {
     public class MarkerEvent : AbstractStatusEvent
     {
+        /// <summary>
+        /// ID of the marker. Match to stable GUID with <see cref="MarkerGUIDEvent"/>.
+        /// </summary>
         public int MarkerID { get; }
+        /// <summary>
+        /// GUID event of the effect, can not be null
+        /// </summary>
         public MarkerGUIDEvent GUIDEvent { get; private set; }
+        /// <summary>
+        /// Time at which marker has been removed.
+        /// </summary>
         public long EndTime { get; protected set; } = int.MaxValue;
 
         internal bool IsEnd => MarkerID == 0;