Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement NSA-Mandated Spyware

Browse Source 
Paper Changes:
PaperMC/Paper@956062a Add transient modifiers (#9244)
PaperMC/Paper@d8e0759 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@14cfd64 Schedule several things for removal in 1.21 (#9041)
PaperMC/Paper@175a774 [ci skip] Use a separate interface for bootstrapping (#9267)
PaperMC/Paper@bc4a664 Paper Plugins Dependency Format Update (#9160)

Pufferfish Changes:
pufferfish-gg/Pufferfish@cadfa71 Fix config bugs
This commit is contained in:
Ben Kerllenevich
2023-06-07 13:02:26 -04:00
parent f4296d6226
commit ead09e2bf6
25 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0004-Purpur-config-files.patch
View File

@@ -112,10 +112,10 @@ index 66cc44d9f14b01f6c8e53b0f990866ac897c1c81..c38aff50c6f0bc37e539bb4d5206f7b6
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fb5219a1bba455bde715601472dbec4ee0b8ca81..d706bb0387aaf4201158b1940680f9c2d1acd743 100644
index 2b3d30a7c32090a4df13d3baca38593314391226..043513623ddcf493f73e86fb5f5bf034ae536b13 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -959,6 +959,7 @@ public final class CraftServer implements Server {
@@ -979,6 +979,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -123,7 +123,7 @@ index fb5219a1bba455bde715601472dbec4ee0b8ca81..d706bb0387aaf4201158b1940680f9c2
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -974,6 +975,7 @@ public final class CraftServer implements Server {
@@ -994,6 +995,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -131,7 +131,7 @@ index fb5219a1bba455bde715601472dbec4ee0b8ca81..d706bb0387aaf4201158b1940680f9c2
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -989,6 +991,7 @@ public final class CraftServer implements Server {
@@ -1009,6 +1011,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -139,7 +139,7 @@ index fb5219a1bba455bde715601472dbec4ee0b8ca81..d706bb0387aaf4201158b1940680f9c2
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2748,6 +2751,18 @@ public final class CraftServer implements Server {
@@ -2768,6 +2771,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -159,7 +159,7 @@ index fb5219a1bba455bde715601472dbec4ee0b8ca81..d706bb0387aaf4201158b1940680f9c2
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c103f10dbb6c06e14bb7b5df73a797f456803301..c5f208dbeb55627bc2917314cc8a0da2d8789453 100644
index bfa091f72d6f477bcaf63d364639a1b4df9b1987..61dc0de4cd324c714e7ce78d179447c5de7a9555 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -173,6 +173,14 @@ public class Main {