Fix crash with payphone hook

If you enter a room with a payphone but without lights being disabled, the game will crash. This fixes that.

Author: tesselslate

Triggers/RemoveLightSourcesTrigger.cs

@@ -16,22 +16,20 @@ class RemoveLightSourcesTrigger : Trigger {
 
         private static bool HooksEnabled = false;
 
-        public RemoveLightSourcesTrigger(EntityData data, Vector2 offset) : base(data, offset) {
-            LightsField = typeof(LightingRenderer).GetField("lights", BindingFlags.NonPublic | BindingFlags.Instance);
-            BloomField = typeof(Payphone).GetField("bloom", BindingFlags.NonPublic | BindingFlags.Instance);
-            LightField = typeof(Payphone).GetField("light", BindingFlags.NonPublic | BindingFlags.Instance);
-        }
+        public RemoveLightSourcesTrigger(EntityData data, Vector2 offset) : base(data, offset) { }
 
         public static void Load() {
             Everest.Events.Level.OnLoadLevel += LevelLoadHandler;
             Everest.Events.Level.OnExit += OnExitHandler;
-            On.Celeste.Payphone.Update += PayphoneHook;
+
+            LightsField = typeof(LightingRenderer).GetField("lights", BindingFlags.NonPublic | BindingFlags.Instance);
+            BloomField = typeof(Payphone).GetField("bloom", BindingFlags.NonPublic | BindingFlags.Instance);
+            LightField = typeof(Payphone).GetField("light", BindingFlags.NonPublic | BindingFlags.Instance);
         }
 
         public static void Unload() {
             Everest.Events.Level.OnLoadLevel -= LevelLoadHandler;
             Everest.Events.Level.OnExit -= OnExitHandler;
-            On.Celeste.Payphone.Update -= PayphoneHook;
         }
 
         private static void PayphoneHook(On.Celeste.Payphone.orig_Update orig, Payphone self) {
@@ -41,10 +39,8 @@ private static void PayphoneHook(On.Celeste.Payphone.orig_Update orig, Payphone
             BloomPoint tempBloom = (BloomPoint) BloomField.GetValue(self);
             tempBloom.Visible = tempLight.Visible = !tempLight.Visible;
 
-            if(self.SceneAs<Level>().Session.GetFlag("lightsDisabled")) {
-                BloomField.SetValue(self, tempBloom);
-                LightField.SetValue(self, tempLight);
-            }
+            BloomField.SetValue(self, tempBloom);
+            LightField.SetValue(self, tempLight);
         }
 
         private static void LevelLoadHandler(Level loadedLevel, Player.IntroTypes playerIntro, bool isFromLoader) {
@@ -93,6 +89,7 @@ private static void EnableLightRender() {
             On.Celeste.LightingRenderer.BeforeRender -= LightHook;
             On.Celeste.BloomRenderer.Apply -= BloomRendererHook;
             On.Celeste.Level.TransitionTo -= TransitionHook;
+            On.Celeste.Payphone.Update -= PayphoneHook;
             HooksEnabled = false;
         }
 
@@ -103,6 +100,7 @@ private static void DisableLightRender() {
             On.Celeste.LightingRenderer.BeforeRender += LightHook;
             On.Celeste.BloomRenderer.Apply += BloomRendererHook;
             On.Celeste.Level.TransitionTo += TransitionHook;
+            On.Celeste.Payphone.Update += PayphoneHook;
             HooksEnabled = true;
         }