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

adjust logging for global draw block

Browse Source
This commit is contained in:
rootdarkarchon
2023-05-19 10:39:01 +02:00
parent fff40f579f
commit b766f302a8
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MareSynchronos/Services/DalamudUtilService.cs
View File

@@ -32,6 +32,7 @@ public class DalamudUtilService : IHostedService
private uint? _classJobId = 0; private uint? _classJobId = 0;
private DateTime _delayedFrameworkUpdateCheck = DateTime.Now; private DateTime _delayedFrameworkUpdateCheck = DateTime.Now;
private string _lastGlobalBlockPlayer = string.Empty; private string _lastGlobalBlockPlayer = string.Empty;
private string _lastGlobalBlockReason = string.Empty;
private ushort _lastZone = 0; private ushort _lastZone = 0;
private Dictionary<string, (string Name, nint Address)> _playerCharas = new(StringComparer.Ordinal); private Dictionary<string, (string Name, nint Address)> _playerCharas = new(StringComparer.Ordinal);
private bool _sentBetweenAreas = false; private bool _sentBetweenAreas = false;
@@ -334,6 +335,7 @@ public class DalamudUtilService : IHostedService
var drawObj = gameObj->DrawObject; var drawObj = gameObj->DrawObject;
var playerName = p.Name.ToString(); var playerName = p.Name.ToString();
bool isDrawing = false; bool isDrawing = false;
bool isDrawingChanged = false;
if ((nint)drawObj != IntPtr.Zero) if ((nint)drawObj != IntPtr.Zero)
{ {
isDrawing = gameObj->RenderFlags == 0b100000000000; isDrawing = gameObj->RenderFlags == 0b100000000000;
@@ -345,32 +347,40 @@ public class DalamudUtilService : IHostedService
isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0; isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
if (isDrawing) if (isDrawing)
{ {
if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal)) if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal) && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded"))
{ {
_lastGlobalBlockPlayer = playerName; _lastGlobalBlockPlayer = playerName;
_logger.LogTrace("Global draw block: START => {name} (HasModelFilesInSlotLoaded)", playerName); _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
isDrawingChanged = true;
} }
} }
} }
else else
{ {
if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal)) if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal) && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded"))
{ {
_lastGlobalBlockPlayer = playerName; _lastGlobalBlockPlayer = playerName;
_logger.LogTrace("Global draw block: START => {name} (HasModelInSlotLoaded)", playerName); _lastGlobalBlockReason = "HasModelInSlotLoaded";
isDrawingChanged = true;
} }
} }
} }
else else
{ {
if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal)) if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal) && !string.Equals(_lastGlobalBlockReason, "RenderFlags"))
{ {
_lastGlobalBlockPlayer = playerName; _lastGlobalBlockPlayer = playerName;
_logger.LogTrace("Global draw block: START => {name} (RenderFlags)", playerName); _lastGlobalBlockReason = "RenderFlags";
isDrawingChanged = true;
} }
} }
} }
if (isDrawingChanged)
{
_logger.LogTrace("Global draw block: START => {name} ({reason})", playerName, _lastGlobalBlockReason);
}
IsAnythingDrawing |= isDrawing; IsAnythingDrawing |= isDrawing;
} }
} }
@@ -400,6 +410,7 @@ public class DalamudUtilService : IHostedService
{ {
_logger.LogTrace("Global draw block: END => {name}", _lastGlobalBlockPlayer); _logger.LogTrace("Global draw block: END => {name}", _lastGlobalBlockPlayer);
_lastGlobalBlockPlayer = string.Empty; _lastGlobalBlockPlayer = string.Empty;
_lastGlobalBlockReason = string.Empty;
} }
if (GposeTarget != null && !IsInGpose) if (GposeTarget != null && !IsInGpose)