From 1d8ba033687856738dc1963561ef88db73241c1f Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Mon, 9 Jan 2023 00:26:22 +0100
Subject: [PATCH] not totally fixed grr

---
 buildnumber.txt           |  2 +-
 source/flx3d/Flx3DView.hx | 20 +++++++++++---------
 source/flx3d/FlxView3D.hx |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/buildnumber.txt b/buildnumber.txt
index 962a4e94..93f881d1 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-1956
\ No newline at end of file
+1960
\ No newline at end of file
diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx
index 75d2f18a..3d414184 100644
--- a/source/flx3d/Flx3DView.hx
+++ b/source/flx3d/Flx3DView.hx
@@ -14,6 +14,7 @@ import funkin.system.Logs;
 import flixel.FlxG;
 import flx3d.Flx3DUtil;
 import away3d.library.assets.Asset3DType;
+import away3d.library.Asset3DLibrary;
 import away3d.events.Asset3DEvent;
 import away3d.loaders.parsers.*;
 import away3d.utils.Cast;
@@ -124,21 +125,22 @@ class Flx3DView extends FlxView3D {
     }
 
     override function destroy() {
-        super.destroy();
         if (meshes != null)
             for(mesh in meshes)
                 mesh.dispose();
+
         var bundle = Asset3DLibraryBundle.getInstance('Flx3DView-${__cur3DStageID}');
-        @:privateAccess
-        if (bundle != null)
-            for(asset in bundle._assets) {
-                // very unstable!!
-                try {
-                    bundle.removeAsset(asset, true);
-                } catch(e) {
-                    // woops
+        bundle.stopAllLoadingSessions();
+        @:privateAccess {
+            if (bundle._loadingSessions != null) {
+                for(load in bundle._loadingSessions) {
+                    load.dispose();
                 }
             }
+            Asset3DLibrary._instances.remove('Flx3DView-${__cur3DStageID}');
+        }
+
+        super.destroy();
     }
 
     public inline function addChild(c)
diff --git a/source/flx3d/FlxView3D.hx b/source/flx3d/FlxView3D.hx
index a70713b1..681ff900 100644
--- a/source/flx3d/FlxView3D.hx
+++ b/source/flx3d/FlxView3D.hx
@@ -10,7 +10,7 @@ import openfl.display.BitmapData;
  * @author Ne_Eo 
  * @see https://twitter.com/Ne_Eo_Twitch
  * 
- * Edited by lunarclient
+ * @author lunarclient
  * @see https://twitter.com/lunarcleint
  */
 class FlxView3D extends FlxSprite