Fix #135 and #136

UnknownX7 · Nov 18, 2024 · 755c68c · 755c68c
1 parent dd42bef
commit 755c68c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Hypostasis b/Hypostasis
diff --git a/Modules/EnhancedAutoFaceTarget.cs b/Modules/EnhancedAutoFaceTarget.cs
@@ -30,7 +30,7 @@ protected override void Disable()
 
     private static void PostActionStack(ActionManager* actionManager, uint actionType, uint actionID, uint adjustedActionID, ref ulong targetObjectID, uint param, uint useType, int pvp)
     {
-        if (DalamudApi.DataManager.GetExcelSheet<Action>().GetRow(adjustedActionID) is { NeedToFaceTarget: false })
+        if (DalamudApi.DataManager.GetExcelSheet<Action>().GetRowOrDefault(adjustedActionID) is { NeedToFaceTarget: false })
             removeAutoFaceTargetPatch.Enable();
         else
             removeAutoFaceTargetPatch.Disable();

diff --git a/Modules/QueueMore.cs b/Modules/QueueMore.cs
@@ -56,14 +56,14 @@ private static void PostUseAction(ActionManager* actionManager, uint actionType,
     {
         allowQueuingPatch.Disable();
 
-        if (ret && DalamudApi.DataManager.GetExcelSheet<Action>().GetRow(adjustedActionID) is { ActionCategory.RowId: 9 or 15 })
+        if (ret && DalamudApi.DataManager.GetExcelSheet<Action>().GetRowOrDefault(adjustedActionID) is { ActionCategory.RowId: 9 or 15 })
             lastLBSequence = actionManager->currentSequence;
     }
 
     private static bool CheckAction(uint actionType, uint actionID, uint adjustedActionID) =>
         actionType switch
         {
-            1 when DalamudApi.DataManager.GetExcelSheet<Action>().GetRow(adjustedActionID) is { ActionCategory.RowId: 9 or 15 } => lastLBSequence != Common.ActionManager->currentSequence, // Allow LB
+            1 when DalamudApi.DataManager.GetExcelSheet<Action>().GetRowOrDefault(adjustedActionID) is { ActionCategory.RowId: 9 or 15 } => lastLBSequence != Common.ActionManager->currentSequence, // Allow LB
             2 => true, // Allow items
             5 when actionID == 4 => true, // Allow Sprint
             _ => false

diff --git a/ReAction.csproj b/ReAction.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.3.3.11</Version>
+        <Version>1.3.3.12</Version>
         <TargetFramework>net8.0</TargetFramework>
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64;AnyCPU</Platforms>
+1 −1		Game/Structures/ActionManager.cs
+6 −4		ImGui/ExcelSheet.cs