mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 22:14:40 +01:00
32 lines
1.9 KiB
Diff
32 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index e1d1aaa278287214e2edac5f690d4f5257696ed0..2abd5157b0964fc02994ca7a9317d2fb5539dc1c 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -146,6 +146,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
// 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) {
|
||
|
|
@@ -1579,7 +1580,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void addChannel(String channel) {
|
||
|
|
- Preconditions.checkState(channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
|
||
|
|
+ Preconditions.checkState(DISABLE_CHANNEL_LIMIT || channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel); // Paper - flag to disable channel limit
|
||
|
|
channel = StandardMessenger.validateAndCorrectChannel(channel);
|
||
|
|
if (channels.add(channel)) {
|
||
|
|
server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
|