Fix #35

VedalAI · Jan 3, 2025 · efbd52b · efbd52b
1 parent 8830720
commit efbd52b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Unity/Assets/Actions/ActionWindow.cs b/Unity/Assets/Actions/ActionWindow.cs
@@ -190,8 +190,10 @@ bool shouldForce()
         public void SetForce(float afterSeconds, string query, string? state, bool ephemeralContext = false)
             => SetForce(afterSeconds, () => query, () => state, ephemeralContext);
 
-        private void SendForce()
+        public void Force()
         {
+            if (CurrentState != State.Registered) return;
+
             CurrentState = State.Forced;
             _shouldForceFunc = null;
             WebsocketConnection.TrySend(new ActionsForce(_forceQueryGetter!(), _forceStateGetter!(), _forceEphemeralContext, _actions));
@@ -238,6 +240,17 @@ private void OnDestroy()
             End();
         }
 
+        public void End()
+        {
+            if (CurrentState >= State.Ended) return;
+
+            NeuroActionHandler.UnregisterActions(_actions);
+            _shouldForceFunc = null;
+            _shouldEndFunc = null;
+            CurrentState = State.Ended;
+            Destroy(this);
+        }
+
         #endregion
 
         #region Handling
@@ -251,7 +264,7 @@ public ExecutionResult Result(ExecutionResult result)
             if (CurrentState >= State.Ended) throw new InvalidOperationException("Cannot handle a result after the ActionWindow has ended.");
 
             if (result.Successful) End();
-            // else if (CurrentState == State.Forced) SendForce(); // Vedal is now responsible for retrying forces
+            // else if (CurrentState == State.Forced) Force(); // Vedal is now responsible for retrying forces
 
             return result;
         }
@@ -262,7 +275,7 @@ private void Update()
 
             if (_shouldForceFunc != null && _shouldForceFunc())
             {
-                SendForce();
+                Force();
             }
 
             if (_shouldEndFunc != null && _shouldEndFunc())
@@ -271,15 +284,6 @@ private void Update()
             }
         }
 
-        private void End()
-        {
-            NeuroActionHandler.UnregisterActions(_actions);
-            _shouldForceFunc = null;
-            _shouldEndFunc = null;
-            CurrentState = State.Ended;
-            Destroy(this);
-        }
-
         #endregion
     }
 }
diff --git a/Unity/Assets/package.json b/Unity/Assets/package.json
@@ -3,7 +3,7 @@
   "displayName": "Neuro SDK",
   "description": "Neuro SDK for Unity",
   "author": "Vedal AI",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "unity": "2022.3",
   "dependencies": {
     "com.cysharp.unitask": "2.5.10",