From d09826faf2ceb55f6e1aea491379f228102799bb Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 17:07:09 +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. --- ...nt-protocol-version-and-virtual-host.patch | 4 +-- .../0073-Add-PlayerArmorChangeEvent.patch | 4 +-- ...85-Flag-to-disable-the-channel-limit.patch | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 Spigot-Server-Patches/0285-Flag-to-disable-the-channel-limit.patch diff --git a/Spigot-API-Patches/0072-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0072-Expose-client-protocol-version-and-virtual-host.patch index 04e928ce28..87dff3c32c 100644 --- a/Spigot-API-Patches/0072-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-API-Patches/0072-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 33619b42899f0f4393688abc5274e8affa545445 Mon Sep 17 00:00:00 2001 +From b22dc4ffb81769f759e38cf7516e5bd8da36dbbd Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:44:42 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -68,5 +68,5 @@ index 39684300..23cc8b5e 100644 /** * Gets the "friendly" name to display of this player. This may include -- -2.15.1 +2.16.3 diff --git a/Spigot-API-Patches/0073-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0073-Add-PlayerArmorChangeEvent.patch index 89177f7667..13225fc276 100644 --- a/Spigot-API-Patches/0073-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0073-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From b39929bd4824e7c52ee40e1f6827f638507db00f Mon Sep 17 00:00:00 2001 +From 52bc5ba70f3cc07b0af1b0ca32765db83aae4033 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:45:59 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent @@ -146,5 +146,5 @@ index 00000000..9d56a9e7 + } +} -- -2.15.1 +2.16.3 diff --git a/Spigot-Server-Patches/0285-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0285-Flag-to-disable-the-channel-limit.patch new file mode 100644 index 0000000000..31b8b46889 --- /dev/null +++ b/Spigot-Server-Patches/0285-Flag-to-disable-the-channel-limit.patch @@ -0,0 +1,34 @@ +From c935ab9de2fc167f1a59d13595b327d84f23637b Mon Sep 17 00:00:00 2001 +From: Shane Freeder +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 1e73a3308..fd47065c6 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -93,6 +93,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) { +@@ -1337,7 +1338,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + } + + public void addChannel(String channel) { +- 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 + if (channels.add(channel)) { + server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); + } +-- +2.16.3 +