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:
6ae212125 Display name should never be null
bf2f8aeaf Add @NotNull to Key in org.bukkit.sound (#5241)
01f9b65f9 Sound can implement Adventure's Sound.Type
aa282a1a0 Don't try to deserialize a null string in legacy method
9bcd08cb3 [CI-SKIP] [Auto] Rebuild Patches
ea6fd6076 [Auto] Updated Upstream (Bukkit)
d9b02e94d Misc thread dumps (#5200)
This commit is contained in:
jmp
2021-02-24 00:25:18 -08:00
parent 4602b9b2fc
commit d3c8fb27f3
18 changed files with 62 additions and 62 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 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a061f25e980 100644
index 4f7cfef40225bea13efa37468f51643a99ac594d..6c2e441405e05749b7579d48497281f5c3bee7f8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -864,6 +864,7 @@ public final class CraftServer implements Server {
@@ -865,6 +865,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 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a06
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -899,6 +900,7 @@ public final class CraftServer implements Server {
@@ -900,6 +901,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 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a06
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -917,6 +919,7 @@ public final class CraftServer implements Server {
@@ -918,6 +920,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -400,7 +400,7 @@ index 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a06
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2346,6 +2349,18 @@ public final class CraftServer implements Server {
@@ -2348,6 +2351,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report