e

Author: Yuta12342

source/managers/FreeplayManager.hx

@@ -416,8 +416,11 @@ class FreeplayManager {
 
     public static inline function openFreeplay()
 	{
-        if (CategoryState.loadWeekForce != null)
+        if (CategoryState.loadWeekForce != null && !states.PlayState.Crashed) {
             MusicBeatState.preloadAndSwitchState(Type.createInstance(getFreeplay(), []));
+    } else if (CategoryState.loadWeekForce != null && states.PlayState.Crashed) {
+            FlxG.switchState(Type.createInstance(getFreeplay(), []));
+    }
         else //You cant play a song without picking a category first!
             FlxG.switchState(new states.CategoryState());
 

source/stages/cutscenes/VideoCutscene.hx

@@ -8,11 +8,17 @@ class VideoCutscene {
                 #if VIDEOS_ALLOWED
                 game.startVideo(videoName);
                 #if !LEGACY_PSYCH
-                game.videoCutscene.finishCallback = game.videoCutscene.onSkip = function()
-                {
-                    game.videoCutscene = null;
+                try {
+                    game.videoCutscene.finishCallback = game.videoCutscene.onSkip = function()
+                    {
+                        game.videoCutscene = null;
+                        onEnd();
+                    };
+                } catch (e:Dynamic) {
+                    trace("Error setting video cutscene callbacks: " + e);
+                    trace("It is likely that the video wasn't able to be loaded.");
                     onEnd();
-                };
+                }
                 #else
                 @:privateAccess
                 game.video.bitmap.onEndReached.add(function()

source/yutautil/FlxSafeTween.hx

@@ -0,0 +1,21 @@
+package yutautil;
+
+// This will be a class which simply takes FlxTween, and manages if it crashes, so that the Global Error Handler can simply handle
+// the crash, and this class will just kill the tween and return to the game.
+
+import flixel.FlxG;
+import flixel.tweens.FlxTween;
+import flixel.util.FlxArrayUtil;
+import flixel.util.FlxTimer;
+
+
+class FlxSafeTween
+{
+    // This will be a list of all the tweens that are currently running.
+    private var _tweens:Array<FlxTween>;
+
+    public function new()
+    {
+        _tweens = [];
+    }
+    

source/yutautil/MetaData.hx

@@ -114,6 +114,47 @@ class MetaData {
         add("type", Type.getClassName(Type.getClass(variable)));
         add("pointer", PointerTools.pointer(variable));
 
+        // Special function which will take 2 objects, one a bunch of fields for a start value, and one for an end value. 
+            // This will create a tween for the object, and also automatically null-check itself, so nothing breaks.
+        // add("tween", function(start:Dynamic, end:Dynamic, duration:Float, ?ease:FlxEase):Void {
+        //     if (variable != null) {
+        //     FlxTween.num(start, start, end, duration, {
+        //         ease: ease,
+        //         onUpdate: function(progress:Float):Void {
+        //         if (variable != null) {  
+        //             for (key in Reflect.fields(variable)) {
+        //             var value = Reflect.field(variable, key);
+        //             if (value != null) {
+        //                 if (Std.is(value, Float) || Std.is(value, Int)) {
+        //                 var startValue = Reflect.field(start, key);
+        //                 var endValue = Reflect.field(end, key);
+        //                 if (startValue != null && endValue != null) {
+        //                     var interpolated = startValue + (endValue - startValue) * progress;
+        //                     if (Std.is(value, Int)) {
+        //                     Reflect.setField(variable, key, Std.int(interpolated));
+        //                     } else {
+        //                     Reflect.setField(variable, key, interpolated);
+        //                     }
+        //                 }
+        //                 }
+        //             }
+        //             }
+        //         }
+        //         },
+        //         onComplete: function(tween:FlxTween):Void {
+        //         if (variable != null) {
+        //             for (key in Reflect.fields(variable)) {
+        //             var value = Reflect.field(variable, key);
+        //             if (value != null) {
+        //                 metadata(value);
+        //             }
+        //             }
+        //         }
+        //         }
+        //     });
+        //     }
+        // });
+
     }
 
     private static function cleanup():Void {