Fix bug where GP tick would be halted incorrectly while fishing.

Update Meziantou.Analyzer to 2.0.150.
Kurochi51 · May 3, 2024 · 1e71f16 · 1e71f16
1 parent b3f57b4
commit 1e71f16
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/TickTracker/TickTracker.cs b/TickTracker/TickTracker.cs
@@ -313,13 +313,13 @@ private void ProcessTicks(double currentTime, PlayerCharacter player)
 
         // MP Section
         MPBarWindow.RegenActive = statusList.Exists(e => manaRegenSet.Contains(e.StatusId));
-        var blmGauge = player.ClassJob.Id == 25 ? jobGauges.Get<BLMGauge>() : null;
+        var blmGauge = player.ClassJob.Id is 25 ? jobGauges.Get<BLMGauge>() : null;
         MPBarWindow.TickHalted = blmGauge is not null && blmGauge.InAstralFire;
         var currentMP = player.CurrentMp;
         var fullMP = currentMP == player.MaxMp;
 
         // GP Section
-        GPBarWindow.TickHalted = condition[ConditionFlag.Gathering];
+        GPBarWindow.TickHalted = condition[ConditionFlag.Gathering] && (player.ClassJob.Id is not 18 || condition[ConditionFlag.Diving]);
         var currentGP = player.CurrentGp;
         var fullGP = currentGP == player.MaxGp;
 

diff --git a/TickTracker/TickTracker.csproj b/TickTracker/TickTracker.csproj
@@ -39,7 +39,7 @@
 
     <ItemGroup>
         <PackageReference Include="DalamudPackager" Version="2.1.12" />
-        <PackageReference Include="Meziantou.Analyzer" Version="2.0.147">
+        <PackageReference Include="Meziantou.Analyzer" Version="2.0.150">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/TickTracker/packages.lock.json b/TickTracker/packages.lock.json
@@ -10,9 +10,9 @@
       },
       "Meziantou.Analyzer": {
         "type": "Direct",
-        "requested": "[2.0.147, )",
-        "resolved": "2.0.147",
-        "contentHash": "bloVeZFFQKeJ8QO65XgN1FTHvzKGU523otZjDvQU4Wu7FLWbd/AjWoDFlCaSpBiC+awD/B8Q7CuwINJEVMsk+Q=="
+        "requested": "[2.0.150, )",
+        "resolved": "2.0.150",
+        "contentHash": "rXKN4/Cf58Pv7uUWk4wcZtY+J9mve6wA1BHGYAf9SlpmiayA5fJ4wK2lflIwAkVo8n8HyNCeY3Ej4jwCdLk5nA=="
       }
     }
   }