mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 04:09:54 +01:00
5f175ef9c3
Cleaned up some implementation notes to use existing Vanilla method for some things. merged into parent patch7dd5837dFixed more stuff (NickAcPT)09f01353Remove unsed method (NickAcPT)e5ea4656Extend player profile API to support skin changes (NickAcPT)e67d55d0Extend player profile API to support skin changes (NickAcPT) * pull/1250/head: Fixed more stuff Remove unsed method Extend player profile API to support skin changes Extend player profile API to support skin changes
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
From 8709478ac991a905296c1d2cf7399525648cd014 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 8b20509bc..1874c15ab 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) {
|
|
@@ -1362,7 +1363,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.18.0
|
|
|