liza/PalacePal
liza/PalacePal
1
0
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 47 Activity

Code cleanup

Browse Source
This commit is contained in:
Liza 2023-03-27 20:00:30 +02:00
parent 7e73430179
commit 0b07e8b8f6
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pal.Client/Configuration/ConfigurationData.cs
View File

@ -15,7 +15,7 @@ namespace Pal.Client.Configuration
public const string ConfigFileName = "palace-pal.config.json"; public const string ConfigFileName = "palace-pal.config.json";
private static bool? _supportsDpapi = null; private static bool? _supportsDpapi;
public static bool SupportsDpapi public static bool SupportsDpapi
{ {
get get

10
Pal.Client/Configuration/Legacy/JsonFloorState.cs
View File

@ -20,9 +20,6 @@ namespace Pal.Client.Configuration.Legacy
private static string _pluginConfigDirectory = null!; private static string _pluginConfigDirectory = null!;
// might not be true, but this is 'less strict filtering' for migrations
private static readonly EMode _mode = EMode.Online;
internal static void SetContextProperties(string pluginConfigDirectory) internal static void SetContextProperties(string pluginConfigDirectory)
{ {
_pluginConfigDirectory = pluginConfigDirectory; _pluginConfigDirectory = pluginConfigDirectory;
@ -38,12 +35,7 @@ namespace Pal.Client.Configuration.Legacy
private void ApplyFilters() private void ApplyFilters()
{ {
if (_mode == EMode.Offline) Markers = new ConcurrentBag<JsonMarker>(Markers.Where(x => x.Seen || !x.WasImported || x.Imports.Count > 0));
Markers = new ConcurrentBag<JsonMarker>(Markers.Where(x => x.Seen || (x.WasImported && x.Imports.Count > 0)));
else
// ensure old import markers are removed if they are no longer part of a "current" import
// this MAY remove markers the server sent you (and that you haven't seen), but this should be fixed the next time you enter the zone
Markers = new ConcurrentBag<JsonMarker>(Markers.Where(x => x.Seen || !x.WasImported || x.Imports.Count > 0));
} }
public static JsonFloorState? Load(ushort territoryType) public static JsonFloorState? Load(ushort territoryType)