Update SpikeJumpThroughController.cs

Author: tesselslate

Entities/SpikeJumpThroughController.cs

@@ -9,26 +9,15 @@
 
 namespace Celeste.Mod.SpringCollab2020.Entities {
     [CustomEntity("SpringCollab2020/SpikeJumpThroughController")]
+    [Tracked]
     class SpikeJumpThroughController : Entity {
         private static bool SpikeHooked;
-        private static SpikeJumpThroughController CurrentController;
-        private static SpikeJumpThroughController NextController;
-        private static float TransitionProgress = -1f;
 
         public SpikeJumpThroughController(EntityData data, Vector2 offset) : this(data.Bool("persistent", false), offset) { }
 
         public SpikeJumpThroughController(bool persistent, Vector2 offset) : base(offset) {
             SpringCollab2020Module.Instance.Session.SpikeJumpThroughHooked = persistent;
 
-            Add(new TransitionListener {
-                OnIn = progress => TransitionProgress = progress,
-                OnOut = progress => TransitionProgress = progress,
-                OnInBegin = () => TransitionProgress = 0f,
-                OnInEnd = () => TransitionProgress = -1f
-            });
-
-            Logger.Log("s", SpringCollab2020Module.Instance.Session.SpikeJumpThroughHooked.ToString());
-
         }
 
         public static void Load() {
@@ -39,18 +28,9 @@ public static void Unload() {
             On.Celeste.Level.LoadLevel -= OnLoadLevelHook;
         }
 
-        public override void Update() {
-            base.Update();
-            if (TransitionProgress == -1f && CurrentController == null) {
-                CurrentController = this;
-                NextController = null;
-            }
-        }
-
         public override void Awake(Scene scene) {
             base.Awake(scene);
 
-            NextController = this;
             if (!SpikeHooked) {
                 On.Celeste.Spikes.OnCollide += OnCollideHook;
                 SpikeHooked = true;
@@ -60,12 +40,7 @@ public override void Awake(Scene scene) {
         public override void Removed(Scene scene) {
             base.Removed(scene);
 
-            CurrentController = NextController;
-            NextController = null;
-
-            TransitionProgress = -1f;
-
-            if (SpikeHooked && CurrentController == null) {
+            if (SpikeHooked && scene.Tracker.CountEntities<SpikeJumpThroughController>() <= 1) {
                 On.Celeste.Spikes.OnCollide -= OnCollideHook;
                 SpikeHooked = false;
             }
@@ -74,7 +49,6 @@ public override void Removed(Scene scene) {
         public override void SceneEnd(Scene scene) {
             base.SceneEnd(scene);
 
-            CurrentController = NextController = null;
             if (SpikeHooked) {
                 On.Celeste.Spikes.OnCollide -= OnCollideHook;
                 SpikeHooked = false;