From 2344af7fc522131a40d1cb72f86df61823f86240 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Tue, 11 Jun 2024 15:30:50 +0200 Subject: [PATCH] fix new worlds not being seen, fix erroneous customize+ display --- MareSynchronos/Services/DalamudUtilService.cs | 4 ++-- MareSynchronos/Utils/VariousExtensions.cs | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs index a9d71ca..4485c0b 100644 --- a/MareSynchronos/Services/DalamudUtilService.cs +++ b/MareSynchronos/Services/DalamudUtilService.cs @@ -67,7 +67,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber WorldData = new(() => { return gameData.GetExcelSheet(Dalamud.Game.ClientLanguage.English)! - .Where(w => w.IsPublic && !w.Name.RawData.IsEmpty) + .Where(w => !w.Name.RawData.IsEmpty && w.DataCenter.Row != 0 && (w.IsPublic || char.IsUpper((char)w.Name.RawData[0]))) .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString()); }); mediator.Subscribe(this, async (msg) => @@ -617,4 +617,4 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber _delayedFrameworkUpdateCheck = DateTime.Now; }); } -} \ No newline at end of file +} diff --git a/MareSynchronos/Utils/VariousExtensions.cs b/MareSynchronos/Utils/VariousExtensions.cs index 455f7da..8be6717 100644 --- a/MareSynchronos/Utils/VariousExtensions.cs +++ b/MareSynchronos/Utils/VariousExtensions.cs @@ -150,6 +150,9 @@ public static class VariousExtensions oldData.CustomizePlusData.TryGetValue(objectKind, out var oldCustomizePlusData); newData.CustomizePlusData.TryGetValue(objectKind, out var newCustomizePlusData); + oldCustomizePlusData ??= string.Empty; + newCustomizePlusData ??= string.Empty; + bool customizeDataDifferent = !string.Equals(oldCustomizePlusData, newCustomizePlusData, StringComparison.Ordinal); if (customizeDataDifferent || (forceApplyCustomization && !string.IsNullOrEmpty(newCustomizePlusData))) {