fixing frost timer issue

jjppof · Feb 4, 2024 · 5602072 · 5602072
1 parent 2f0f143
commit 5602072
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/base/field_abilities/FrostFieldPsynergy.ts b/base/field_abilities/FrostFieldPsynergy.ts
@@ -175,6 +175,7 @@ export class FrostFieldPsynergy extends FieldAbilities {
         });
         blink_timer.start();
         target_object.add_unset_callback(() => {
+            blink_timer.stop(true);
             blink_timer.destroy();
         });
     }

diff --git a/base/field_abilities/LiftFieldPsynergy.ts b/base/field_abilities/LiftFieldPsynergy.ts
@@ -349,6 +349,7 @@ export class LiftFieldPsynergy extends FieldAbilities {
         });
         target_hueshift_timer.start();
         target_object.add_unset_callback(() => {
+            target_hueshift_timer?.stop(true);
             target_hueshift_timer?.destroy();
         });
     }

diff --git a/base/interactable_objects/InteractableObjects.ts b/base/interactable_objects/InteractableObjects.ts
@@ -1460,6 +1460,8 @@ export class InteractableObjects {
     }
 
     unset(remove_from_middlelayer_group: boolean = true) {
+        this.on_unset_callbacks.forEach(c => c());
+        this.on_unset_callbacks = [];
         if (this.sprite) {
             this.sprite.filters = undefined;
             this.sprite.destroy();
@@ -1488,7 +1490,6 @@ export class InteractableObjects {
         if (remove_from_middlelayer_group) {
             this.data.middlelayer_group.removeChild(this.sprite);
         }
-        this.on_unset_callbacks.forEach(c => c());
         for (let psynergy_key in this.after_psynergy_cast_events) {
             this.after_psynergy_cast_events[psynergy_key].forEach(e => e.destroy());
         }