Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 51 Wiki Activity

more checks on drawing

Browse Source
This commit is contained in:
defnotken
2026-01-05 15:07:48 -06:00
parent a2ed9f8d2b
commit 9048b3bd87
1 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
LightlessSync/Services/DalamudUtilService.cs
View File

@@ -958,22 +958,35 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
if (address == nint.Zero) if (address == nint.Zero)
return; return;
try
{
var gameObj = (GameObject*)address; var gameObj = (GameObject*)address;
if (gameObj == null || gameObj->ObjectKind == 0) if (gameObj == null || gameObj->ObjectKind == 0)
return; return;
if (!IsGameObjectPresent(address))
{
_logger.LogDebug("Character {name} at {addr} no longer present in object table", characterName, address.ToString("X"));
return;
}
var drawObj = gameObj->DrawObject; var drawObj = gameObj->DrawObject;
bool isDrawing = false; bool isDrawing = false;
bool isDrawingChanged = false; bool isDrawingChanged = false;
if ((nint)drawObj != IntPtr.Zero) if ((nint)drawObj != IntPtr.Zero)
{ {
isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000; isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
if (!isDrawing) if (!isDrawing)
{ {
isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0; var charBase = (CharacterBase*)drawObj;
if (charBase != null)
{
isDrawing = charBase->HasModelInSlotLoaded != 0;
if (!isDrawing) if (!isDrawing)
{ {
isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0; isDrawing = charBase->HasModelFilesInSlotLoaded != 0;
if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal) if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
&& !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal)) && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
{ {
@@ -993,6 +1006,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
} }
} }
} }
}
else else
{ {
if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal) if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
@@ -1012,6 +1026,11 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
IsAnythingDrawing |= isDrawing; IsAnythingDrawing |= isDrawing;
} }
catch (AccessViolationException ex)
{
_logger.LogWarning(ex, "access violation checking character {name} at {addr}", characterName, address.ToString("X"));
}
}
private void FrameworkOnUpdate(IFramework framework) private void FrameworkOnUpdate(IFramework framework)
{ {