oops forgot to push
This commit is contained in:
@@ -88,11 +88,19 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
|
|||||||
_redrawOnNextApplication = true;
|
_redrawOnNextApplication = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
Mediator.Subscribe<CombatOrPerformanceEndMessage>(this, (msg) =>
|
Mediator.Subscribe<CombatEndMessage>(this, (msg) =>
|
||||||
{
|
{
|
||||||
EnableSync();
|
EnableSync();
|
||||||
});
|
});
|
||||||
Mediator.Subscribe<CombatOrPerformanceStartMessage>(this, _ =>
|
Mediator.Subscribe<CombatStartMessage>(this, _ =>
|
||||||
|
{
|
||||||
|
DisableSync();
|
||||||
|
});
|
||||||
|
Mediator.Subscribe<PerformanceEndMessage>(this, (msg) =>
|
||||||
|
{
|
||||||
|
EnableSync();
|
||||||
|
});
|
||||||
|
Mediator.Subscribe<PerformanceStartMessage>(this, _ =>
|
||||||
{
|
{
|
||||||
DisableSync();
|
DisableSync();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_charaDataConfigService.Current.NearbyDrawWisps && !_dalamudUtilService.IsInGpose && !_dalamudUtilService.IsInCombatOrPerforming)
|
if (_charaDataConfigService.Current.NearbyDrawWisps && !_dalamudUtilService.IsInGpose && !_dalamudUtilService.IsInCombat && !_dalamudUtilService.IsPerforming && !_dalamudUtilService.IsInInstance)
|
||||||
await _dalamudUtilService.RunOnFrameworkThread(() => ManageWispsNearby(previousPoses)).ConfigureAwait(false);
|
await _dalamudUtilService.RunOnFrameworkThread(() => ManageWispsNearby(previousPoses)).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -253,7 +253,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombatOrPerforming)
|
if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombat || _dalamudUtilService.IsPerforming || _dalamudUtilService.IsInInstance)
|
||||||
ClearAllVfx();
|
ClearAllVfx();
|
||||||
|
|
||||||
var camera = CameraManager.Instance()->CurrentCamera;
|
var camera = CameraManager.Instance()->CurrentCamera;
|
||||||
|
|||||||
@@ -767,7 +767,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
|
|||||||
_classJobId = localPlayer.ClassJob.RowId;
|
_classJobId = localPlayer.ClassJob.RowId;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IsInCombatOrPerforming)
|
if (!IsInCombat || !IsPerforming || !IsInInstance)
|
||||||
Mediator.Publish(new FrameworkUpdateMessage());
|
Mediator.Publish(new FrameworkUpdateMessage());
|
||||||
|
|
||||||
Mediator.Publish(new PriorityFrameworkUpdateMessage());
|
Mediator.Publish(new PriorityFrameworkUpdateMessage());
|
||||||
@@ -796,7 +796,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
|
|||||||
IsLodEnabled = lodEnabled;
|
IsLodEnabled = lodEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsInCombatOrPerforming)
|
if (IsInCombat || IsPerforming || IsInInstance)
|
||||||
Mediator.Publish(new FrameworkUpdateMessage());
|
Mediator.Publish(new FrameworkUpdateMessage());
|
||||||
|
|
||||||
Mediator.Publish(new DelayedFrameworkUpdateMessage());
|
Mediator.Publish(new DelayedFrameworkUpdateMessage());
|
||||||
|
|||||||
Reference in New Issue
Block a user