friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

potentially fix invalid chara state

Browse Source
This commit is contained in:
Stanley Dimant
2024-10-31 00:08:56 +01:00
parent c66b58d156
commit de0eec5289
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MareSynchronos/Interop/BlockedCharacterHandler.cs
View File

@@ -8,7 +8,8 @@ namespace MareSynchronos.Interop;
public unsafe class BlockedCharacterHandler public unsafe class BlockedCharacterHandler
{ {
private readonly Dictionary<(ulong, ulong), bool> _blockedCharacterCache = new(); private sealed record CharaData(ulong AccId, ulong ContentId);
private readonly Dictionary<CharaData, bool> _blockedCharacterCache = new();
private enum BlockResultType private enum BlockResultType
{ {
@@ -29,15 +30,16 @@ public unsafe class BlockedCharacterHandler
_logger = logger; _logger = logger;
} }
private static (ulong AccId, ulong ContentId) GetIdsFromPlayerPointer(nint ptr) private static CharaData GetIdsFromPlayerPointer(nint ptr)
{ {
if (ptr == nint.Zero) return (0, 0); if (ptr == nint.Zero) return new(0, 0);
var castChar = ((BattleChara*)ptr); var castChar = ((BattleChara*)ptr);
return (castChar->Character.AccountId, castChar->Character.ContentId); return new(castChar->Character.AccountId, castChar->Character.ContentId);
} }
public bool IsCharacterBlocked(nint ptr) public bool IsCharacterBlocked(nint ptr, out bool firstTime)
{ {
firstTime = false;
var combined = GetIdsFromPlayerPointer(ptr); var combined = GetIdsFromPlayerPointer(ptr);
if (_blockedCharacterCache.TryGetValue(combined, out var isBlocked)) if (_blockedCharacterCache.TryGetValue(combined, out var isBlocked))
return isBlocked; return isBlocked;
@@ -45,6 +47,7 @@ public unsafe class BlockedCharacterHandler
if (_getBlockResultType == null) if (_getBlockResultType == null)
return _blockedCharacterCache[combined] = false; return _blockedCharacterCache[combined] = false;
firstTime = true;
var infoProxy = InfoProxyBlacklist.Instance(); var infoProxy = InfoProxyBlacklist.Instance();
var blockStatus = _getBlockResultType(infoProxy, combined.AccId, combined.ContentId); var blockStatus = _getBlockResultType(infoProxy, combined.AccId, combined.ContentId);
_logger.LogTrace("CharaPtr {ptr} is BlockStatus: {status}", ptr, blockStatus); _logger.LogTrace("CharaPtr {ptr} is BlockStatus: {status}", ptr, blockStatus);

5
MareSynchronos/Services/DalamudUtilService.cs
View File

@@ -460,8 +460,11 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
if (chara == null || chara.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player) if (chara == null || chara.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player)
continue; continue;
if (_blockedCharacterHandler.IsCharacterBlocked(chara.Address)) if (_blockedCharacterHandler.IsCharacterBlocked(chara.Address, out bool firstTime) && firstTime)
{
_logger.LogTrace("Skipping character {addr}, blocked/muted", chara.Address.ToString("X"));
continue; continue;
}
var charaName = ((GameObject*)chara.Address)->NameString; var charaName = ((GameObject*)chara.Address)->NameString;
var hash = GetHashedAccIdFromPlayerPointer(chara.Address); var hash = GetHashedAccIdFromPlayerPointer(chara.Address);