Added Controller Guard to stand-alone classes

jeffreylanters · Mar 26, 2023 · 2285d45 · 2285d45
1 parent 70fedf8
commit 2285d45
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Runtime/EntityComponent.cs b/Runtime/EntityComponent.cs
@@ -6,7 +6,7 @@ namespace ElRaccoone.EntityComponentSystem {
   /// </summary>
   /// <typeparam name="EntityComponentType">The Entity Component type.</typeparam>
   /// <typeparam name="EntitySystemType">The Entity System type.</typeparam>
-  public abstract class EntityComponent<EntityComponentType, EntitySystemType> : UnityEngine.MonoBehaviour, IEntityComponent, IEntityComponentInternals
+  public abstract class EntityComponent<EntityComponentType, EntitySystemType> : MonoBehaviour, IEntityComponent, IEntityComponentInternals
     where EntityComponentType : EntityComponent<EntityComponentType, EntitySystemType>, new()
     where EntitySystemType : EntitySystem<EntitySystemType, EntityComponentType>, new() {
     /// <summary>
@@ -78,6 +78,9 @@ public Vector3 localScale {
     /// <returns>The system.</returns>
     /// <exception cref="System.Exception"></exception>
     EntitySystemType GetSystem () {
+      if (Controller.Instance == null) {
+        throw new System.Exception ("Tried to access the Controller while non is instantiated");
+      }
       if (system != null)
         return system;
       if (Controller.Instance.HasSystem<EntitySystemType> ()) {