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

update paper

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-20 16:41:59 -05:00
parent 5455ba8ace
commit 11c5bd4796
11 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0002-Purpur-config-files.patch
View File

@@ -435,10 +435,10 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faabd3dd0bd 100644
index 92eb2dd977fbe00f7f2785e77f6d98c026bcbe2e..337bd4b47eab7c8b1d23c9bdeb7324f074191790 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -879,6 +879,7 @@ public final class CraftServer implements Server {
@@ -875,6 +875,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -446,7 +446,7 @@ index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faa
for (ServerLevel world : this.console.getAllLevels()) {
world.serverLevelData.setDifficulty(config.difficulty);
world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
@@ -913,6 +914,7 @@ public final class CraftServer implements Server {
@@ -909,6 +910,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -454,7 +454,7 @@ index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faa
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -928,6 +930,7 @@ public final class CraftServer implements Server {
@@ -924,6 +926,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -462,7 +462,7 @@ index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faa
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2368,6 +2371,18 @@ public final class CraftServer implements Server {
@@ -2364,6 +2367,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}