Fix: Crash beim Restart nach Quit to Main Menu

Assets/GWConquest/Scripts/BoltEntityCache.cs

@@ -47,6 +47,11 @@ namespace GWConquest
                 return behaviour.entity.NetworkId;
             }
         }
+
+        public static void ClearCache()
+        {
+            dictionary.Clear();
+        }
     }
 
     

Assets/GWConquest/Scripts/FormationCategories.cs

@@ -16,6 +16,11 @@ namespace GWConquest {
             }
         }
 
+        public static void ClearRegistry()
+        {
+            _instance = null;
+        }
+
         [System.Serializable]
         public class CategoryEntry
         {

Assets/GWConquest/Scripts/GameManager.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System.Collections;
 
 namespace GWConquest
@@ -129,5 +129,31 @@ namespace GWConquest
             LoadingScreen.Dismiss();
         }
 
+        public static void ClearAllCaches()
+        {
+            _instance = null;
+
+            HostFactionIndex = 0;
+            EntitiesLoaded = false;
+            InitialEntityCount = int.MaxValue;
+
+            BattleLog.Instance = null;
+
+            BoltEntityCache.ClearCache();
+            District.AllDistricts.Clear();
+            Formation.AllFormations.Clear();
+
+            FormationCategories.ClearRegistry();
+            ItemRegistry.ClearRegistry();
+            Planet.ClearRegistry();
+            PlanetRegistry.ClearRegistry();
+            UnitClass.ClearRegistry();
+            Zone.ClearRegistry();
+
+            Player.CurrentPlayer = null;
+            Player.PlayerList.Clear();
+            SoundEffects.Instance = null;
+        }
+
     }
 }

Assets/GWConquest/Scripts/ItemRegistry.cs

@@ -16,6 +16,11 @@ namespace GWConquest
             }
         }
 
+        public static void ClearRegistry()
+        {
+            _instance = null;
+        }
+
         [System.Serializable]
         public class ItemEntry {
             public string Name;

Assets/GWConquest/Scripts/Planet.cs

@@ -21,6 +21,11 @@ namespace GWConquest
             }
         }
 
+        public static void ClearRegistry()
+        {
+            _allPlanets = null;
+        }
+
         public GameObject textPrefab;
 
         public Zone[] spaceZones;

Assets/GWConquest/Scripts/PlanetRegistry.cs

@@ -50,6 +50,11 @@ namespace GWConquest
                 return null;
             }
         }
+
+        public static void ClearRegistry()
+        {
+            planetDataMap = null;
+        }
         
         public static void Load()
         {

Assets/GWConquest/Scripts/UI/MainMenu.cs

@@ -14,6 +14,8 @@ namespace GWConquest
 
         public void StartServer(int hostFactionIndex)
         {
+            GameManager.ClearAllCaches();
+
             GameManager.HostFactionIndex = hostFactionIndex;
 
             LoadingScreen.Show();
@@ -23,6 +25,8 @@ namespace GWConquest
 
         public void StartClient()
         {
+            GameManager.ClearAllCaches();
+            
             BoltLauncher.StartClient();
         }
 

Assets/GWConquest/Scripts/UnitClass.cs

@@ -10,6 +10,11 @@ namespace GWConquest
     {
         private static Dictionary<string, UnitClass> classMap;
 
+        public static void ClearRegistry()
+        {
+            classMap = null;
+        }
+
         public static void LoadClassMap()
         {
             BoltLog.Info("Loading unit classes...");

Assets/GWConquest/Scripts/Zone.cs

@@ -31,6 +31,11 @@ namespace GWConquest
 
         private static Dictionary<int, Zone> zoneDict = new Dictionary<int, Zone>();
 
+        public static void ClearRegistry()
+        {
+            zoneDict.Clear();
+        }
+
         public static IEnumerable<Zone> AllZones
         {
             get => zoneDict.Values;