t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix new worlds not being seen, fix erroneous customize+ display

Browse Source
This commit is contained in:
Stanley Dimant
2024-06-11 15:30:50 +02:00
committed by Loporrit
parent 765d60b0fe
commit 2344af7fc5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronos/Services/DalamudUtilService.cs
View File

@@ -67,7 +67,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
WorldData = new(() => WorldData = new(() =>
{ {
return gameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.World>(Dalamud.Game.ClientLanguage.English)! return gameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.World>(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()); .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
}); });
mediator.Subscribe<TargetPairMessage>(this, async (msg) => mediator.Subscribe<TargetPairMessage>(this, async (msg) =>
@@ -617,4 +617,4 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
_delayedFrameworkUpdateCheck = DateTime.Now; _delayedFrameworkUpdateCheck = DateTime.Now;
}); });
} }
} }

3
MareSynchronos/Utils/VariousExtensions.cs
View File

@@ -150,6 +150,9 @@ public static class VariousExtensions
oldData.CustomizePlusData.TryGetValue(objectKind, out var oldCustomizePlusData); oldData.CustomizePlusData.TryGetValue(objectKind, out var oldCustomizePlusData);
newData.CustomizePlusData.TryGetValue(objectKind, out var newCustomizePlusData); newData.CustomizePlusData.TryGetValue(objectKind, out var newCustomizePlusData);
oldCustomizePlusData ??= string.Empty;
newCustomizePlusData ??= string.Empty;
bool customizeDataDifferent = !string.Equals(oldCustomizePlusData, newCustomizePlusData, StringComparison.Ordinal); bool customizeDataDifferent = !string.Equals(oldCustomizePlusData, newCustomizePlusData, StringComparison.Ordinal);
if (customizeDataDifferent || (forceApplyCustomization && !string.IsNullOrEmpty(newCustomizePlusData))) if (customizeDataDifferent || (forceApplyCustomization && !string.IsNullOrEmpty(newCustomizePlusData)))
{ {