From f6df37133923102bbcad6863d68db387fd9d972d Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Tue, 29 Oct 2024 22:29:28 +0100
Subject: [PATCH] simplify get ids

---
 MareSynchronos/Interop/BlockedCharacterHandler.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/MareSynchronos/Interop/BlockedCharacterHandler.cs b/MareSynchronos/Interop/BlockedCharacterHandler.cs
index 17a45fd..16a9fff 100644
--- a/MareSynchronos/Interop/BlockedCharacterHandler.cs
+++ b/MareSynchronos/Interop/BlockedCharacterHandler.cs
@@ -29,21 +29,16 @@ public unsafe class BlockedCharacterHandler
         _logger = logger;
     }
 
-    private static ulong GetAccIdFromPlayerPointer(nint ptr)
+    private static (ulong AccId, ulong ContentId) GetIdsFromPlayerPointer(nint ptr)
     {
-        if (ptr == nint.Zero) return 0;
-        return ((BattleChara*)ptr)->Character.AccountId;
-    }
-
-    private static ulong GetContentIdFromPlayerPointer(nint ptr)
-    {
-        if (ptr == nint.Zero) return 0;
-        return ((BattleChara*)ptr)->Character.ContentId;
+        if (ptr == nint.Zero) return (0, 0);
+        var castChar = ((BattleChara*)ptr);
+        return (castChar->Character.AccountId, castChar->Character.ContentId);
     }
 
     public bool IsCharacterBlocked(nint ptr)
     {
-        (ulong AccId, ulong ContentId) combined = (GetAccIdFromPlayerPointer(ptr), GetContentIdFromPlayerPointer(ptr));
+        var combined = GetIdsFromPlayerPointer(ptr);
         if (_blockedCharacterCache.TryGetValue(combined, out var isBlocked))
             return isBlocked;