Try and make refresh more robust

Author: AsgardXIV

Brio/Game/Actor/ActorRedrawService.cs

@@ -47,7 +47,9 @@ public unsafe void Redraw(GameObject gameObject, RedrawType redrawType, bool pre
                 raw->DrawObject->Object.Position = originalPositon;
                 CanRedraw = true;
             },
-            50);
+            50,
+            1,
+            true);
         }
         else
         {

Brio/Game/Actor/ActorSpawnService.cs

@@ -56,8 +56,6 @@ private void GPoseService_OnGPoseStateChange(bool isInGpose)
         newPlayer->GameObject.Position= originalPlayer->GameObject.Position;
         newPlayer->GameObject.SetName(((int)newId).ToCharacterName());
 
-        newPlayer->GameObject.DisableDraw();
-
         newPlayer->CopyFromCharacter(newPlayer, 0); // Some tools get confused (Like Penumbra) unless we copy onto ourselves after name change
 
         newPlayer->GameObject.EnableDraw();

Brio/Game/Core/FrameworkUtils.cs

@@ -30,9 +30,10 @@ public void RunDeferred(
     {
         var newTask = new DeferredTask()
         {
-            ConditionAction = (task) => task.TickCount >= task.FrameTarget,
+            ConditionAction = (task) => task.TickCount >= task.StartFrame,
             CompleteAction = action,
-            FrameTarget = delay,
+            MaxFrames = delay,
+            StartFrame = delay,
             DebugPath = $"{callerFile}:{callerLine} - {callerMember}"
         };
 
@@ -42,7 +43,9 @@ public void RunDeferred(
     public void RunUntilSatisfied(
         Func<bool> condition,
         Action<bool> onSatisfied,
-        int attempts = 0,
+        int attempts,
+        int dontStartFor = 0,
+        bool waitOneMore = false,
         [CallerFilePath] string callerFile = "",
         [CallerLineNumber] int callerLine = 0,
         [CallerMemberName] string callerMember = ""
@@ -52,7 +55,9 @@ public void RunUntilSatisfied(
         {
             ConditionAction = (_) => condition.Invoke(),
             CompleteAction = onSatisfied.Invoke,
-            FrameTarget = attempts,
+            MaxFrames = attempts,
+            StartFrame = dontStartFor,
+            DeferOnceMore = waitOneMore,
             DebugPath = $"{callerFile}:{callerLine} - {callerMember}"
         };
 
@@ -72,20 +77,31 @@ private void TickTasks()
             var task = _deferredTasks[i];
             task.TickCount++;
 
-            var conditionSatisfied = CheckTask(task);
-
-            if(conditionSatisfied == true)
-            {
-                _deferredTasks.RemoveAt(i--);
-                CompleteTask(task, true);
-            }
-            else if(conditionSatisfied == null || task.FrameTarget <= task.TickCount)
+            if (task.TickCount >= task.StartFrame)
             {
-                if (task.FrameTarget <= task.TickCount)
-                    PluginLog.Warning($"Task timed out. {task}");
-
-                _deferredTasks.RemoveAt(i--);
-                CompleteTask(task, false);
+                var conditionSatisfied = CheckTask(task);
+
+                if (conditionSatisfied == true)
+                {
+                    if (task.DeferOnceMore)
+                    {
+                        task.DeferOnceMore = false;
+                        task.ConditionAction = (_) => true;
+                    }
+                    else
+                    {
+                        _deferredTasks.RemoveAt(i--);
+                        CompleteTask(task, true);
+                    }
+                }
+                else if (conditionSatisfied == null || task.MaxFrames <= task.TickCount)
+                {
+                    if (task.MaxFrames <= task.TickCount)
+                        PluginLog.Warning($"Task timed out. {task}");
+
+                    _deferredTasks.RemoveAt(i--);
+                    CompleteTask(task, false);
+                }
             }
         }
     }
@@ -117,11 +133,13 @@ private void CompleteTask(DeferredTask task, bool success)
 
 class DeferredTask
 {
-    public Func<DeferredTask, bool> ConditionAction { get; init; } = null!;
-    public Action<bool> CompleteAction { get; init; } = null!;
-    public string DebugPath { get; init; } = null!;
-    public int FrameTarget { get; init; }
+    public Func<DeferredTask, bool> ConditionAction { get; set; } = null!;
+    public Action<bool> CompleteAction { get; set; } = null!;
+    public string DebugPath { get; set; } = null!;
+    public int MaxFrames { get; set; }
+    public int StartFrame { get; set; }
     public int TickCount { get; set; } = -1;
+    public bool DeferOnceMore { get; set; } = false;
 
-    public override string ToString() => $"{DebugPath}. T: {FrameTarget} C: {TickCount}";
+    public override string ToString() => $"{DebugPath}. T: {MaxFrames} C: {TickCount}";
 }

Brio/IPC/PenumbraIPC.cs

@@ -99,7 +99,9 @@ public unsafe void RedrawActorWithCollection(GameObject gameObject, string colle
                     Ipc.SetCollectionForObject.Subscriber(Dalamud.PluginInterface).Invoke(index, oldName, true, true);
                     CanApplyCollection = true;
                 }, 
-                50
+                50,
+                3,
+                true
            );
         }
         catch(Exception ex)