Merge branch '1.11.6' into folders-name-limit

This commit is contained in:
2025-09-10 16:02:48 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -17,6 +17,7 @@ public class NameplateService : DisposableMediatorSubscriberBase
private readonly INamePlateGui _namePlateGui; private readonly INamePlateGui _namePlateGui;
private readonly PairManager _pairManager; private readonly PairManager _pairManager;
public NameplateService(ILogger<NameplateService> logger, public NameplateService(ILogger<NameplateService> logger,
LightlessConfigService configService, LightlessConfigService configService,
INamePlateGui namePlateGui, INamePlateGui namePlateGui,
@@ -36,11 +37,9 @@ public class NameplateService : DisposableMediatorSubscriberBase
private void OnNamePlateUpdate(INamePlateUpdateContext context, IReadOnlyList<INamePlateUpdateHandler> handlers) private void OnNamePlateUpdate(INamePlateUpdateContext context, IReadOnlyList<INamePlateUpdateHandler> handlers)
{ {
if (!_configService.Current.IsNameplateColorsEnabled || (_configService.Current.IsNameplateColorsEnabled && _clientState.IsPvPExcludingDen)) return;
if (!_configService.Current.IsNameplateColorsEnabled && !_clientState.IsPvPExcludingDen) return;
var visibleUsersIds = _pairManager.GetOnlineUserPairs().Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue).Select(u => (ulong)u.PlayerCharacterId).ToHashSet(); var visibleUsersIds = _pairManager.GetOnlineUserPairs().Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue).Select(u => (ulong)u.PlayerCharacterId).ToHashSet();
var colors = _configService.Current.NameplateColors; var colors = _configService.Current.NameplateColors;
foreach (var handler in handlers) foreach (var handler in handlers)
{ {
var playerCharacter = handler.PlayerCharacter; var playerCharacter = handler.PlayerCharacter;
@@ -63,6 +62,7 @@ public class NameplateService : DisposableMediatorSubscriberBase
public void RequestRedraw() public void RequestRedraw()
{ {
_namePlateGui.RequestRedraw(); _namePlateGui.RequestRedraw();
} }