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

small fixes for waiting

Browse Source
This commit is contained in:
Stanley Dimant
2022-09-03 23:54:26 +02:00
parent 2e3f7aad2b
commit 2f5159cd4b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -146,7 +146,6 @@ public class CharacterDataFactory
return; return;
} }
//Logger.Verbose("Adding File Replacement for Material " + fileName);
var mtrlPath = fileName.Split("|")[2]; var mtrlPath = fileName.Split("|")[2];
if (cache.FileReplacements.ContainsKey(objectKind)) if (cache.FileReplacements.ContainsKey(objectKind))
@@ -185,8 +184,6 @@ public class CharacterDataFactory
{ {
if (varPath.IsNullOrEmpty()) return; if (varPath.IsNullOrEmpty()) return;
//Logger.Verbose("Adding File Replacement for Texture " + texPath);
if (cache.FileReplacements.ContainsKey(objectKind)) if (cache.FileReplacements.ContainsKey(objectKind))
{ {
if (cache.FileReplacements[objectKind].Any(c => c.GamePaths.Contains(varPath))) if (cache.FileReplacements[objectKind].Any(c => c.GamePaths.Contains(varPath)))
@@ -205,8 +202,6 @@ public class CharacterDataFactory
{ {
if (string.IsNullOrEmpty(texPath)) return; if (string.IsNullOrEmpty(texPath)) return;
//Logger.Verbose("Adding File Replacement for Texture " + texPath);
if (cache.FileReplacements.ContainsKey(objectKind)) if (cache.FileReplacements.ContainsKey(objectKind))
{ {
if (cache.FileReplacements[objectKind].Any(c => c.GamePaths.Contains(texPath))) if (cache.FileReplacements[objectKind].Any(c => c.GamePaths.Contains(texPath)))
@@ -243,7 +238,8 @@ public class CharacterDataFactory
Logger.Verbose("Character is null but it shouldn't be, waiting"); Logger.Verbose("Character is null but it shouldn't be, waiting");
Thread.Sleep(50); Thread.Sleep(50);
} }
//_dalamudUtil.WaitWhileCharacterIsDrawing(charaPointer);
_dalamudUtil.WaitWhileCharacterIsDrawing(charaPointer);
Stopwatch st = Stopwatch.StartNew(); Stopwatch st = Stopwatch.StartNew();
@@ -357,8 +353,12 @@ public class CharacterDataFactory
{ {
previousData.FileReplacements.Add(objectKind, new()); previousData.FileReplacements.Add(objectKind, new());
} }
if (!previousData.FileReplacements[objectKind].Any(k => k.ResolvedPath == item.ResolvedPath))
{
previousData.FileReplacements[objectKind].Add(item); previousData.FileReplacements[objectKind].Add(item);
} }
}
transientResourceManager.PersistTransientResources(charaPointer, objectKind, CreateFileReplacement); transientResourceManager.PersistTransientResources(charaPointer, objectKind, CreateFileReplacement);