PaperMC/patches/server/0180-Flag-to-disable-the-channel-limit.patch

32 lines
2 KiB
Diff
Raw Permalink Normal View History

2021-06-11 14:02:28 +02:00
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
2024-12-03 19:05:31 +01:00
index 7bb315c45a3b021ec6016c7ff70a88c1a371f799..ce22bf772aa00e7d06328961bb69ff89eb3e52c6 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2024-10-24 19:29:35 +02:00
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private CraftWorldBorder clientWorldBorder = null;
private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus; // Paper - more resource pack API
2021-06-11 14:02:28 +02:00
+ private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
public CraftPlayer(CraftServer server, ServerPlayer entity) {
super(server, entity);
2024-10-24 19:29:35 +02:00
@@ -2296,7 +2297,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
2021-06-11 14:02:28 +02:00
public void addChannel(String channel) {
2021-06-12 21:30:37 +02:00
- Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
2024-08-12 18:42:08 +02:00
+ Preconditions.checkState(DISABLE_CHANNEL_LIMIT || this.channels.size() < 128, "Cannot register channel. Too many channels registered!"); // Paper - flag to disable channel limit
2021-06-11 14:02:28 +02:00
channel = StandardMessenger.validateAndCorrectChannel(channel);
2021-06-12 21:30:37 +02:00
if (this.channels.add(channel)) {
2023-10-27 01:34:58 +02:00
this.server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));