2018-07-19 12:42:43 +08:00
From cfcc5a751071bb5a3d54c5147ed2d0b1ce0652fc Mon Sep 17 00:00:00 2001
2018-04-01 00:07:09 +08:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 31 Mar 2018 17:04:26 +0100
Subject: [PATCH] Flag to disable the channel limit
In some enviroments, the channel limit set by spigot can cause issues,
e.g. servers which allow and support the usage of mod packs.
provide an optional flag to disable this check, at your own risk.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2018-07-19 12:42:43 +08:00
index c0b484177..60bc6d331 100644
2018-04-01 00:07:09 +08:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2018-07-19 02:55:52 +08:00
@@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2018-04-01 00:07:09 +08:00
// Paper start
private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
private String resourcePackHash;
+ private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
// Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
2018-07-19 02:55:52 +08:00
@@ -1385,7 +1386,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2018-04-01 00:07:09 +08:00
}
public void addChannel(String channel) {
2018-07-19 02:55:52 +08:00
- com.google.common.base.Preconditions.checkState( channels.size() < 128, "Too many channels registered" ); // Spigot
+ com.google.common.base.Preconditions.checkState( DISABLE_CHANNEL_LIMIT || channels.size() < 128, "Too many channels registered" ); // Spigot // Paper - flag to disable channel limit
channel = StandardMessenger.validateAndCorrectChannel(channel);
2018-04-01 00:07:09 +08:00
if (channels.add(channel)) {
server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
--
2018-06-30 13:40:52 +08:00
2.18.0
2018-04-01 00:07:09 +08:00