From 6d3ec1d8fd7f61b25768441e5e654f9a9cbb7d48 Mon Sep 17 00:00:00 2001
From: personalized-advertising
 <265311956+personalized-advertising@users.noreply.github.com>
Date: Sat, 8 Aug 2026 14:24:39 +0100
Subject: [PATCH] configurable channel limit

---
 .../io/papermc/paper/connection/PluginMessageBridgeImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/io/papermc/paper/connection/PluginMessageBridgeImpl.java b/paper-server/src/main/java/io/papermc/paper/connection/PluginMessageBridgeImpl.java
index db1f63a3a6cd..c6412c1301fa 100644
--- a/paper-server/src/main/java/io/papermc/paper/connection/PluginMessageBridgeImpl.java
+++ b/paper-server/src/main/java/io/papermc/paper/connection/PluginMessageBridgeImpl.java
@@ -13,9 +13,10 @@
 public interface PluginMessageBridgeImpl {
 
     boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
+    int CHANNEL_LIMIT = Integer.getInteger("paper.pluginMessageChannelLimit", 128); // Paper - add a flag to customize the channel limit
 
     default boolean addChannel(String channel) {
-        Preconditions.checkState(DISABLE_CHANNEL_LIMIT || this.channels().size() < 128, "Cannot register channel. Too many channels registered!"); // Paper - flag to disable channel limit
+        Preconditions.checkState(DISABLE_CHANNEL_LIMIT || this.channels().size() < CHANNEL_LIMIT, "Cannot register channel. Too many channels registered!"); // Paper - flag to disable channel limit
         channel = StandardMessenger.validateAndCorrectChannel(channel);
         if (channels().add(channel)) {
             if (this instanceof CraftPlayer player) {