From 37a1a49fda5b513940c244a37984b38d619a982e Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Tue, 28 Apr 2020 14:10:54 -0400
Subject: [PATCH] Allow disabling BungeeCord plugin message channel.

---
 .../proxy/config/VelocityConfiguration.java        | 14 ++++++++++++++
 .../backend/BungeeCordMessageResponder.java        |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
index 806ef44ce..67d9fcd7f 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
@@ -402,6 +402,10 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
     return pingPassthrough;
   }
 
+  public boolean isBungeePluginChannelEnabled() {
+    return advanced.isBungeePluginMessageChannel();
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -654,6 +658,10 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
     @ConfigKey("tcp-fast-open")
     private boolean tcpFastOpen = false;
 
+    @Comment("Enables BungeeCord plugin messaging channel support on Velocity.")
+    @ConfigKey("bungee-plugin-message-channel")
+    private boolean bungeePluginMessageChannel = true;
+
     private Advanced() {
     }
 
@@ -666,6 +674,7 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
         this.readTimeout = toml.getLong("read-timeout", 30000L).intValue();
         this.proxyProtocol = toml.getBoolean("proxy-protocol", false);
         this.tcpFastOpen = toml.getBoolean("tcp-fast-open", false);
+        this.bungeePluginMessageChannel = toml.getBoolean("bungee-plugin-message-channel", true);
       }
     }
 
@@ -697,6 +706,10 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
       return tcpFastOpen;
     }
 
+    public boolean isBungeePluginMessageChannel() {
+      return bungeePluginMessageChannel;
+    }
+
     @Override
     public String toString() {
       return "Advanced{"
@@ -707,6 +720,7 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
           + ", readTimeout=" + readTimeout
           + ", proxyProtocol=" + proxyProtocol
           + ", tcpFastOpen=" + tcpFastOpen
+          + ", bungeePluginMessageChannel=" + bungeePluginMessageChannel
           + '}';
     }
   }
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java
index 911e803cd..deb5b2304 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java
@@ -273,6 +273,10 @@ class BungeeCordMessageResponder {
   }
 
   boolean process(PluginMessage message) {
+    if (!proxy.getConfiguration().isBungeePluginChannelEnabled()) {
+      return false;
+    }
+
     if (!MODERN_CHANNEL.getId().equals(message.getChannel()) && !LEGACY_CHANNEL.getId()
         .equals(message.getChannel())) {
       return false;