Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rebase

This commit is contained in:
Tamion 2024-02-24 19:15:59 +01:00
parent 70fd62f350
commit f1130aa52e
No known key found for this signature in database
GPG Key ID: 01E616386DBAE296
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0762-Configurable-chat-thread-limit.patch
View File

@ -22,10 +22,10 @@ is actually processed, this is honestly really just exposed for the misnomers or
who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 281eaeab7ede6addfd57a809f8752a7d988e2436..3c9f08da21bb50828868d5a0b6a393e36ebd6046 100644
index acaa20be47ece35fae693e797df2995c313d6aab..a8894774af42fed6e6c885689fa25324f7445634 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -308,7 +308,18 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -284,7 +284,18 @@ public class GlobalConfiguration extends ConfigurationPart {
@PostProcess
private void postProcess() {

4
patches/server/0981-Rewrite-chunk-system.patch
View File

@ -14605,7 +14605,7 @@ index 0000000000000000000000000000000000000000..962d3cae6340fc11607b59355e291629
+
+}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index ac5807723bd95e05265c7ce098909bab91544017..281eaeab7ede6addfd57a809f8752a7d988e2436 100644
index a8894774af42fed6e6c885689fa25324f7445634..3c9f08da21bb50828868d5a0b6a393e36ebd6046 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -29,6 +29,45 @@ public class GlobalConfiguration extends ConfigurationPart {
@ -14676,7 +14676,7 @@ index ac5807723bd95e05265c7ce098909bab91544017..281eaeab7ede6addfd57a809f8752a7d
public UnsupportedSettings unsupportedSettings;
public class UnsupportedSettings extends ConfigurationPart {
@@ -201,7 +225,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -199,7 +223,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@PostProcess
private void postProcess() {

14
patches/server/1062-Add-RequiredPlugins.patch → patches/server/1048-Add-RequiredPlugins.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add RequiredPlugins
diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
index 04efba1517e2bde8ecced31ab2eb669b2e84a28c..e88d534b13740a20cfed272c774200be6a12bb7c 100644
index eedbf46e04b5ae420f9bedcbc2bbb10643ba7e22..bcc4b62ed0bf3ff82ad86fe9375addd4c833319d 100644
--- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
+++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
@@ -211,6 +211,11 @@ class PaperPluginInstanceManager {
@@ -209,6 +209,11 @@ class PaperPluginInstanceManager {
if (!(plugin instanceof JavaPlugin javaPlugin)) {
throw new IllegalArgumentException("Only expects java plugins.");
}
@ -21,10 +21,10 @@ index 04efba1517e2bde8ecced31ab2eb669b2e84a28c..e88d534b13740a20cfed272c774200be
return;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 142d2c48239d4ebe3896218536656d116cd24d7c..add071514643b27084d7f1d5b29768edf094e5c3 100644
index 9f7ed337463cc9bb370a5541d9de5cd8f9c1a78a..af051867fd6e1c5d96cebdc7671fa75c36e29f54 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -300,6 +300,7 @@ public final class CraftServer implements Server {
@@ -302,6 +302,7 @@ public final class CraftServer implements Server {
private boolean overrideAllCommandBlockCommands = false;
public boolean ignoreVanillaPermissions = false;
private final List<CraftPlayer> playerView;
@ -32,7 +32,7 @@ index 142d2c48239d4ebe3896218536656d116cd24d7c..add071514643b27084d7f1d5b29768ed
public int reloadCount;
private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
public static Exception excessiveVelEx; // Paper - Velocity warnings
@@ -550,6 +551,14 @@ public final class CraftServer implements Server {
@@ -552,6 +553,14 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
@ -47,7 +47,7 @@ index 142d2c48239d4ebe3896218536656d116cd24d7c..add071514643b27084d7f1d5b29768ed
// Spigot start - Allow vanilla commands to be forced to be the main command
this.setVanillaCommands(true);
this.commandMap.setFallbackCommands();
@@ -1054,6 +1063,7 @@ public final class CraftServer implements Server {
@@ -1071,6 +1080,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
}
@ -55,7 +55,7 @@ index 142d2c48239d4ebe3896218536656d116cd24d7c..add071514643b27084d7f1d5b29768ed
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
this.pluginManager.clearPlugins();
this.commandMap.clearCommands();
@@ -1095,6 +1105,7 @@ public final class CraftServer implements Server {
@@ -1112,6 +1122,7 @@ public final class CraftServer implements Server {
this.loadPlugins();
this.enablePlugins(PluginLoadOrder.STARTUP);
this.enablePlugins(PluginLoadOrder.POSTWORLD);