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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
613bdc3f [Auto] Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-09-14 13:19:01 -05:00
parent 0e1cb93964
commit d4301d4a64
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,10 +344,10 @@ index 000000000..4904be939
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6d21293e5..918ca762c 100644
index c7a9b31e3..09097ec75 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -855,6 +855,7 @@ public final class CraftServer implements Server {
@@ -857,6 +857,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
com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
@@ -355,7 +355,7 @@ index 6d21293e5..918ca762c 100644
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -890,6 +891,7 @@ public final class CraftServer implements Server {
@@ -892,6 +893,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
@@ -363,7 +363,7 @@ index 6d21293e5..918ca762c 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -908,6 +910,7 @@ public final class CraftServer implements Server {
@@ -910,6 +912,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -371,7 +371,7 @@ index 6d21293e5..918ca762c 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2252,6 +2255,18 @@ public final class CraftServer implements Server {
@@ -2263,6 +2266,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report