[PUSH] 3.1.0.3

Nik-Potokar · Oct 15, 2023 · ac2db66 · ac2db66
1 parent 983376d
commit ac2db66
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/XIVSlothCombo/Combos/JobHelpers/BLM.cs b/XIVSlothCombo/Combos/JobHelpers/BLM.cs
@@ -56,7 +56,11 @@ public OpenerState CurrentState
             {
                 if (value != currentState)
                 {
-                    if (value == OpenerState.PrePull) PrePullStep = 1;
+                    if (value == OpenerState.PrePull)
+                    {
+                        Svc.Log.Debug($"Entered PrePull Opener");
+                        PrePullStep = 1;
+                    }
                     if (value == OpenerState.InOpener) OpenerStep = 1;
                     if (value == OpenerState.OpenerFinished || value == OpenerState.FailedOpener)
                     {
@@ -340,21 +344,18 @@ private void ResetOpener()
         {
             PrePullStep = 0;
             OpenerStep = 0;
+            CurrentState = OpenerState.PrePull;
             ActionWatching.CombatActions.Clear();
             ActionWatching.LastAction = 0;
             ActionWatching.LastAbility = 0;
             ActionWatching.LastSpell = 0;
             ActionWatching.LastWeaponskill = 0;
         }
 
-        private bool openerEventsSetup = false;
-
         public bool DoFullOpener(ref uint actionID, bool simpleMode)
         {
             if (!LevelChecked) return false;
 
-            if (!openerEventsSetup) { Service.Condition.ConditionChange += CheckCombatStatus; openerEventsSetup = true; }
-
             if (CurrentState == OpenerState.PrePull || CurrentState == OpenerState.FailedOpener)
                 if (DoPrePullSteps(ref actionID)) return true;
 
@@ -370,17 +371,10 @@ public bool DoFullOpener(ref uint actionID, bool simpleMode)
                 }
             }
 
-            return false;
-        }
+            if (!CustomComboFunctions.InCombat() && CurrentState is not OpenerState.PrePull)
+                ResetOpener();
 
-        private void CheckCombatStatus(ConditionFlag flag, bool value)
-        {
-            if (flag == ConditionFlag.InCombat && value == false) ResetOpener();
-        }
-
-        internal void Dispose()
-        {
-            Service.Condition.ConditionChange -= CheckCombatStatus;
+            return false;
         }
     }
 

diff --git a/XIVSlothCombo/XIVSlothCombo.cs b/XIVSlothCombo/XIVSlothCombo.cs
@@ -180,8 +180,6 @@ public void Dispose()
 
         private void DisposeOpeners()
         {
-            BLM.BLM_ST_SimpleMode.BLMOpener.Dispose();
-            BLM.BLM_ST_AdvancedMode.BLMOpener.Dispose();
             NIN.NIN_ST_SimpleMode.NINOpener.Dispose();
             NIN.NIN_ST_AdvancedMode.NINOpener.Dispose();
         }

diff --git a/XIVSlothCombo/XIVSlothCombo.csproj b/XIVSlothCombo/XIVSlothCombo.csproj
@@ -4,7 +4,7 @@
 	<PropertyGroup>
 		<Authors>Team Sloth</Authors>
 		<Company>-</Company>
-		<Version>3.1.0.2</Version>
+		<Version>3.1.0.3</Version>
 		<!-- This is the version that will be used when pushing to the repo.-->
 		<Description>XIVCombo for lazy players</Description>
 		<Copyright>Copyleft attick 2021 thanks attick UwU</Copyright>