From 8a048f0505b0034e848b2995192f1dd4695b0857 Mon Sep 17 00:00:00 2001
From: EpicPlayerA10 <62206933+EpicPlayerA10@users.noreply.github.com>
Date: Fri, 13 Jan 2023 23:43:50 +0100
Subject: [PATCH] Fix sendPluginMessage (#926)

---
 .../proxy/server/VelocityRegisteredServer.java             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java b/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java
index dc671414d..fe28ae00e 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java
@@ -155,9 +155,10 @@ public class VelocityRegisteredServer implements RegisteredServer, ForwardingAud
    */
   public boolean sendPluginMessage(ChannelIdentifier identifier, ByteBuf data) {
     for (ConnectedPlayer player : players.values()) {
-      VelocityServerConnection connection = player.getConnectedServer();
-      if (connection != null && connection.getServer() == this) {
-        return connection.sendPluginMessage(identifier, data);
+      VelocityServerConnection serverConnection = player.getConnectedServer();
+      if (serverConnection != null && serverConnection.getConnection() != null
+              && serverConnection.getServer() == this) {
+        return serverConnection.sendPluginMessage(identifier, data);
       }
     }