fix: clean cast on data.

ArchiDog1998 · Jul 22, 2023 · 1d9a02d · 1d9a02d
1 parent 463465f
commit 1d9a02d
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs
@@ -453,31 +453,15 @@ private unsafe void OnCast(uint sourceId, IntPtr ptr)
 
             var actionId = *(ushort*)ptr;
 
-            string name = string.Empty;
-            ushort icon = 0;
-            var action = Svc.Data.GetExcelSheet<Action>()?.GetRow(actionId);
-
-            if(action?.Cast100ms > 0)
-            {
-                name = action?.Name ?? string.Empty;
-                icon = actionId == 4 ? (ushort)118 //Mount
-                        : action?.Icon ?? 0;
-            }
-            else
-            {
-                var item = Svc.Data.GetExcelSheet<Item>()?.GetRow(actionId);
-                if (item?.CastTimes > 0)
-                {
-                    name = item?.Name ?? string.Empty;
-                    icon = item?.Icon ?? 0;
-                }
-            }
+            Svc.Chat.Print(actionId.ToString());
 
+            var action = Svc.Data.GetExcelSheet<Action>()?.GetRow(actionId);
 
             AddItem(new TimelineItem()
             {
-                Name = name,
-                Icon = icon,
+                Name =  action?.Name ?? string.Empty,
+                Icon =  actionId == 4 ? (ushort)118 //Mount
+                        : action?.Icon ?? 0,
                 StartTime = DateTime.Now,
                 GCDTime = GCD,
                 CastingTime = Player.Object.TotalCastTime - Player.Object.CurrentCastTime,