From 739d0e5af6484efaddf48ed72643cc3a70238ae4 Mon Sep 17 00:00:00 2001
From: GoldenEdit <45533337+GoldenEdit@users.noreply.github.com>
Date: Thu, 28 May 2026 00:22:23 +0100
Subject: [PATCH] Fix inverted PluginMessageEvent source/target in
 InitialConnectSessionHandler

---
 .../proxy/connection/client/InitialConnectSessionHandler.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java
index 816d930b77..c6e1f0ca29 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java
@@ -65,8 +65,7 @@ public boolean handle(PluginMessagePacket packet) {
       }
 
       byte[] copy = ByteBufUtil.getBytes(packet.content());
-      PluginMessageEvent event = new PluginMessageEvent(serverConn, serverConn.getPlayer(), id,
-          copy);
+      PluginMessageEvent event = new PluginMessageEvent(player, serverConn, id, copy);
       server.getEventManager().fire(event)
           .thenAcceptAsync(pme -> {
             if (pme.getResult().isAllowed() && serverConn.isActive()) {