rework server time packet processing (again)

marzent · Mar 17, 2024 · 2d11f1b · 2d11f1b
1 parent 391b37f
commit 2d11f1b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/IINACT/FfxivActPluginWrapper.cs b/IINACT/FfxivActPluginWrapper.cs
@@ -38,7 +38,8 @@ public partial class FfxivActPluginWrapper : IDisposable
     private ISettingsMediator settingsMediator = null!;
     private readonly ParseMediator parseMediator;
 
-    private readonly IServerTimeProcessor serverTimeProcessor;
+    private readonly ServerTimeProcessor serverTimeProcessor;
+    private readonly IReadServerTime readServerTime;
     private readonly MobArrayProcessor mobArrayProcessor;
     private readonly IZoneMapProcessor zoneMapProcessor;
     private readonly CombatantManager combatantManager;
@@ -99,7 +100,8 @@ public unsafe FfxivActPluginWrapper(
         var scanMemory = (ScanMemory)ffxivActPlugin._dataCollection._scanMemory;
 
         processManager = scanMemory._processManager;
-        serverTimeProcessor = scanMemory._serverTimeProcessor;
+        serverTimeProcessor = (ServerTimeProcessor)scanMemory._serverTimeProcessor;
+        readServerTime = serverTimeProcessor._readServerTime;
         mobArrayProcessor = (MobArrayProcessor)scanMemory._mobArrayProcessor;
         zoneMapProcessor = scanMemory._zoneProcessor;
         combatantManager = (CombatantManager)scanMemory._combatantManager;
@@ -119,7 +121,13 @@ public unsafe FfxivActPluginWrapper(
 
         this.chatGui.ChatMessage += OnChatMessage;
         ActGlobals.oFormActMain.BeforeLogLineRead += OFormActMain_BeforeLogLineRead;
-        Machina.FFXIV.Dalamud.DalamudClient.GetServerTime = () => serverTimeProcessor.ServerTime;
+        Machina.FFXIV.Dalamud.DalamudClient.GetServerTime = () =>
+        {
+            var timestamp = readServerTime.Read();
+            var seconds = timestamp & 0xFFFFFFFF;
+            var milliseconds = timestamp >> 32;
+            return (long)((seconds * 1000) + milliseconds);
+        };
 
         cancellationTokenSource = new CancellationTokenSource();
         scanThread = new Thread(() => ScanMemory(cancellationTokenSource.Token))