+ fixes for Events

Author: actionk

Events/CompiledEventListener.cs

@@ -0,0 +1,16 @@
+using Scellecs.Morpeh.Events;
+
+namespace Scellecs.Morpeh
+{
+    public readonly struct CompiledEventListener<T> where T: IWorldEvent
+    {
+        public readonly IQuerySystem querySystem;
+        public readonly EventListener<T> listener;
+
+        public CompiledEventListener(IQuerySystem querySystem, EventListener<T> listener)
+        {
+            this.querySystem = querySystem;
+            this.listener = listener;
+        }
+    }
+}

Events/CompiledEventListener.cs.meta

@@ -28,7 +28,7 @@ public class EventListener<T> : EventListener, IEnumerable<T> where T : IWorldEv
         public bool HasPublishedEventsThisFrame { get; private set; }
         private bool IsUpdateScheduled => HasPublishedEventsThisFrame || hasScheduledEventsForNextFrame;
 
-        public EventListener(IQuerySystem querySystem, EventsFeature feature) : base(querySystem, feature)
+        public EventListener(EventsFeature feature) : base(feature)
         {
         }
 
@@ -133,11 +133,9 @@ private void TryCatchInvokeCallback()
     public abstract class EventListener
     {
         internal EventsFeature feature;
-        internal IQuerySystem querySystem;
 
-        protected EventListener(IQuerySystem querySystem, EventsFeature feature)
+        protected EventListener(EventsFeature feature)
         {
-            this.querySystem = querySystem;
             this.feature = feature;
         }
 

Events/Data.meta

@@ -71,20 +71,25 @@ public static void ScheduleEvent<T>(this World world, T data) where T : IWorldEv
         // ------------------------------------------------- //
 
         [PublicAPI]
-        public static EventListener<T> CreateEventListener<T>(this IQuerySystem querySystem) where T : IWorldEvent
+        public static CompiledEventListener<T> CreateEventListener<T>(this IQuerySystem querySystem) where T : IWorldEvent
         {
             var type = typeof(T);
-            var eventFeature = querySystem.World.GetFeature<EventsFeature>();
+            if (!querySystem.World.TryGetFeature(out EventsFeature eventFeature))
+            {
+                Debug.LogError($"You should enable [{nameof(EventsFeature)}] for world [{querySystem.World}] before using [{nameof(CreateEventListener)}]!");
+                return default;
+            }
+
             if (eventFeature.eventListenersByEventType.TryGetValue(type, out var registeredEvent))
-                return (EventListener<T>)registeredEvent;
+                return new CompiledEventListener<T>(querySystem, (EventListener<T>)registeredEvent);
 
-            registeredEvent = new EventListener<T>(querySystem, eventFeature);
+            registeredEvent = new EventListener<T>(eventFeature);
             eventFeature.eventListenersByEventType.Add(type, registeredEvent);
-            return (EventListener<T>)registeredEvent;
+            return new CompiledEventListener<T>(querySystem, (EventListener<T>)registeredEvent);
         }
 
         [PublicAPI]
-        public static EventListener<EventWithEntity<T>> CreateEntityEventListener<T>(this IQuerySystem querySystem) where T : IWorldEvent
+        public static CompiledEventListener<EventWithEntity<T>> CreateEntityEventListener<T>(this IQuerySystem querySystem) where T : IWorldEvent
         {
             return CreateEventListener<EventWithEntity<T>>(querySystem);
         }