1.2.1.0

Fix of initializations.

Author: pmswe

SZones.csproj

@@ -5,7 +5,7 @@
 		<TargetFrameworks>net472</TargetFrameworks>
 		<AssemblyName>SZones</AssemblyName>
 		<RootNamespace>SZones</RootNamespace>
-		<Version>1.2.0.1-beta</Version>
+		<Version>1.2.1.0</Version>
 		<NoWarn>$(NoWarn);CS0436</NoWarn>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>
 		<Nullable>annotations</Nullable>

Utilities/Utils.cs

@@ -59,7 +59,8 @@ public static partial class Utils
 {
     // just shorthands, you can simply remove/rename them if you want to.
     public static ZoneManager inst => ZoneManager.Instance;
-    public static Config conf => ZoneManager.Instance.Configuration.Instance;
+    static Config config;
+    public static Config conf => config ??= ZoneManager.Instance?.Configuration?.Instance;
     //
 
     public static T FindByName<T>(this IEnumerable<T> enumerable, Func<T, string> nameGetter, string name, bool fullName = false)

ZoneManager.cs

@@ -8,14 +8,14 @@ public static bool Create(Zone zone)
     {
         if (zone is null || Get(zone.Name) is not null) return false;
         Zones.Add(zone);
-        zone.Initialize();
         Save();
+        SafeInitialize(zone);
         return true;
     }
     public static void Delete(Zone zone)
     {
         if (zone is null) return;
-        zone.Dispose();
+        SafeFinalize(zone);
         Zones.Remove(zone);
         Save();
     }
@@ -25,15 +25,32 @@ public static void Save()
         lock (config) config.Save();
     }
 
+    public static void SafeFinalize(Zone zone)
+    {
+        try
+        {
+            zone.Finalize();
+        }
+        catch (Exception ex) { Logger.Log(ex); }
+    }
+    public static void SafeInitialize(Zone zone)
+    {
+        try
+        {
+            zone.Initialize();
+        }
+        catch (Exception ex) { Logger.Log(ex); }
+    }
+
     protected override void Unload()
     {
         foreach (var zone in Zones)
-            zone.Dispose();
+            SafeFinalize(zone);
     }
     protected override void Load()
     {
         foreach (var zone in Zones)
-            zone.Initialize();
+            SafeInitialize(zone);
     }
 
     public static Zone Get(string name) => conf.Zones.FindByName(x => x.Name, name);

Zones/BoxColliderZone.cs

@@ -7,15 +7,15 @@ public override SVector3 Position
     {
         get
         {
-            if(Controller is null) return base.Position;
+            if(!controller) return base.Position;
             var center = Controller.Collider.center;
             center.y = Controller.Collider.bounds.min.y;
             return center;
         }
         set
         {
             base.Position = value;
-            if (Controller is null) return;
+            if (!controller) return;
             Controller.Collider.center = Position;
         }
     }

Zones/CuboidZone.cs

@@ -13,7 +13,7 @@ public virtual SVector3 Size
         set
         {
             size = value;
-            if (Controller is null) return;
+            if (!controller) return;
             Controller.Collider.size = size * SizeModifier;
         }
     }

Zones/SpheroidZone.cs

@@ -13,7 +13,7 @@ public virtual float Radius
         set
         {
             radius = value;
-            if (Controller is null) return;
+            if (!controller) return;
             Controller.Collider.radius = radius * RadiusModifier;
         }
     }

Zones/Zone.cs

@@ -16,14 +16,23 @@ public virtual SVector3 Position
         set
         {
             position = value;
-            if (Object is null) return;
+            if (!Object) return;
             Object.transform.position = value;
         }
     }
     public virtual bool ShouldSerializePosition() => true;
 
+    protected ZoneController controller;
     [XmlIgnore, JsonIgnore]
-    public virtual ZoneController Controller { get; protected set; }
+    public virtual ZoneController Controller
+    {
+        get
+        {
+            TryReinitialize();
+            return controller;
+        }
+        protected set => controller = value;
+    }
 
     protected GameObject Object;
     private static GameObject _prefab;
@@ -33,37 +42,76 @@ internal virtual void Initialize()
     {
         if (Object) return;
         UnityObject.DontDestroyOnLoad(Object = UnityObject.Instantiate(Prefab));
+
         foreach(var body in Object.GetComponents<Rigidbody>())
             UnityObject.Destroy(body);
+
+        InitializeController();
+
         Position = position; // update position
     }
-    internal virtual void Dispose()
+
+    internal virtual void InitializeController() { }
+
+    internal virtual void Finalize()
+    {
+        FinalizeController();
+        UnityObject.Destroy(Object);
+    }
+
+    internal virtual void FinalizeController()
     {
-        if (Controller) UnityObject.Destroy(Controller);
-        if (Object) UnityObject.Destroy(Object);
+        UnityObject.Destroy(controller);
     }
 
+    public virtual void Reinitialize()
+    {
+        Finalize();
+        Initialize();
+    }
+
+    public virtual void ReinitializeController()
+    {
+        FinalizeController();
+        InitializeController();
+    }
+
+    public void TryReinitialize()
+    {
+        if (!Object) Reinitialize();
+        else if (!controller) ReinitializeController();
+    }
+
+    public virtual bool IsValid() => Object && controller;
+
     public override string ToString() => ToJsonString(this, true, new ValueTypeToStringJsonConverter());
 }
 public abstract class Zone<TController> : Zone
     where TController : ZoneController
 {
     [XmlIgnore, JsonIgnore]
-    public virtual new TController Controller { get => (TController)base.Controller; private set => base.Controller = value; }
+    public virtual new TController Controller 
+    { 
+        get => (TController)base.Controller;
+        private set => base.Controller = value; 
+    }
 
-    internal override void Initialize()
+    internal override void InitializeController()
     {
-        base.Initialize();
-        (Controller = Object.GetOrAddComponent<TController>()).Initialize(this);
-        Controller.OnPlayerEnter += Debug_PlayerEnterHandler;
-        Controller.OnPlayerExit += Debug_PlayerExitHandler;
+        base.InitializeController();
+        if (controller) return;
+        (controller = Object.GetOrAddComponent<TController>()).Initialize(this);
+        controller.OnPlayerEnter += Debug_PlayerEnterHandler;
+        controller.OnPlayerExit += Debug_PlayerExitHandler;
     }
-    internal override void Dispose()
+
+    internal override void FinalizeController()
     {
-        Controller.OnPlayerEnter -= Debug_PlayerEnterHandler;
-        Controller.OnPlayerExit -= Debug_PlayerExitHandler;
-        base.Dispose();
+        if (!controller) return;
+        controller.OnPlayerEnter -= Debug_PlayerEnterHandler;
+        controller.OnPlayerExit -= Debug_PlayerExitHandler;
     }
+
     private void Debug_PlayerEnterHandler(Player player)
     {
         if (!conf.DebugInformation) return;