Append the event to EventListenerPhaseContext

Author: aromaa

forge/src/launch/java/org/spongepowered/forge/launch/event/SpongeEventBus.java

@@ -125,7 +125,7 @@ public boolean post(final Event event, final IEventBusInvokeDispatcher wrapper)
 
             try (
                 final CauseStackManager.StackFrame frame = PhaseTracker.getInstance().pushCauseFrame();
-                final PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(null))
+                final PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(event, null))
             {
                 if (context != null) {
                     context.buildAndSwitch();

neoforge/src/launch/java/org/spongepowered/neoforge/launch/event/SpongeEventBus.java

@@ -44,7 +44,7 @@ public SpongeEventBus(final BusBuilderImpl busBuilder) {
     public <T extends Event> T post(T event) {
         try (
             final CauseStackManager.StackFrame frame = PhaseTracker.getInstance().pushCauseFrame();
-            final PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(null)
+            final PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(event, null)
         ) {
             if (context != null) {
                 context.buildAndSwitch();
@@ -57,7 +57,7 @@ public <T extends Event> T post(T event) {
     public <T extends Event> T post(EventPriority phase, T event) {
         try (
             final CauseStackManager.StackFrame frame = PhaseTracker.getInstance().pushCauseFrame();
-            final PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(null)
+            final PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(event, null)
         ) {
             if (context != null) {
                 context.buildAndSwitch();

src/main/java/org/spongepowered/common/event/manager/SpongeEventManager.java

@@ -367,7 +367,7 @@ protected final boolean post(final Event event, final List<RegisteredListener<?>
         for (final RegisteredListener handler : handlers) {
             try (
                     final CauseStackManager.StackFrame frame = PhaseTracker.getInstance().pushCauseFrame();
-                    final @Nullable PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(handler.getPlugin())
+                    final @Nullable PhaseContext<@NonNull ?> context = SpongeEventManager.createListenerContext(event, handler.getPlugin())
             ) {
                 frame.pushCause(handler.getPlugin());
                 if (context != null) {
@@ -387,9 +387,11 @@ protected final boolean post(final Event event, final List<RegisteredListener<?>
         return event instanceof Cancellable && ((Cancellable) event).isCancelled();
     }
 
-    public static @Nullable EventListenerPhaseContext createListenerContext(@Nullable final PluginContainer plugin) {
+    public static @Nullable EventListenerPhaseContext createListenerContext(final Object event, @Nullable final PluginContainer plugin) {
         if (PhaseTracker.getInstance().getPhaseContext().allowsEventListener()) {
-            final EventListenerPhaseContext context = PluginPhase.Listener.GENERAL_LISTENER.createPhaseContext(PhaseTracker.getInstance());
+            final EventListenerPhaseContext context = PluginPhase.Listener.GENERAL_LISTENER
+                .createPhaseContext(PhaseTracker.getInstance())
+                .event(event);
             if (plugin != null) {
                 context.source(plugin);
             }