fix #503 Using Douse will sliding on ice turns off collision and can …

…lead to passing through objects
jjppof · Mar 31, 2023 · e6b5ae8 · e6b5ae8
1 parent fe9f925
commit e6b5ae8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/base/field_abilities/FieldAbilities.ts b/base/field_abilities/FieldAbilities.ts
@@ -296,12 +296,10 @@ export abstract class FieldAbilities {
             },
             //after_destroy
             (reset_casting_psy_flag: boolean = true) => {
-                this.controllable_char.toggle_collision(this.previous_collision_status.char);
                 if (reset_casting_psy_flag) {
                     this.controllable_char.casting_psynergy = false;
                 }
                 if (this.target_object) {
-                    this.target_object.toggle_collision(this.previous_collision_status.target);
                     if (this.target_object.is_interactable_object) {
                         const events = (this.target_object as InteractableObjects).after_psynergy_cast_events[
                             this.ability_key_name
@@ -316,6 +314,10 @@ export abstract class FieldAbilities {
             //before_destroy
             (reset_map_tint: boolean = true) => {
                 this.cast_finisher();
+                this.controllable_char.toggle_collision(this.previous_collision_status.char);
+                if (this.target_object) {
+                    this.target_object.toggle_collision(this.previous_collision_status.target);
+                }
                 if (this.reset_map && reset_map_tint) {
                     this.reset_map();
                 }