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

Updated Upstream (Paper)

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

Paper Changes:
9c9583cd2 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2020-12-12 18:54:25 -06:00
parent c51e3913e4
commit 258ae0734a
12 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,10 +373,10 @@ index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f287b4996ac 100644
index 92bfae8f8249e70105fd848f01f950b67bb1d97e..7502726207073bdac6fc4166064575696f6a7270 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -857,6 +857,7 @@ public final class CraftServer implements Server {
@@ -862,6 +862,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
@@ -384,7 +384,7 @@ index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f28
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -892,6 +893,7 @@ public final class CraftServer implements Server {
@@ -897,6 +898,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
@@ -392,7 +392,7 @@ index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f28
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -910,6 +912,7 @@ public final class CraftServer implements Server {
@@ -915,6 +917,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -400,7 +400,7 @@ index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f28
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2288,6 +2291,18 @@ public final class CraftServer implements Server {
@@ -2293,6 +2296,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report