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

Updated Upstream (Paper)

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

Paper Changes:
2780e94 Fix PaperTickList (#6241)
b854e7e Drop unneeded patch (#6240)
2961b2a Fix various mob drops being captured as death drops (#5675)
3801a39 Add ItemRarity test (#6247)
170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
2021-07-23 10:55:13 -05:00
parent 0dad40ac19
commit dd259870b0
24 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,10 +459,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 a173b6b0e49bec5d0b0d15384526cb261000bf33..b018082b7703b07285a0ba4717f25da9c57cfbfc 100644
index affe0e9976d6ed444f39ce838726373852989a1c..cb0c931575f53969206a0591869f968c45b77722 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -876,6 +876,7 @@ public final class CraftServer implements Server {
@@ -885,6 +885,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
@@ -470,7 +470,7 @@ index a173b6b0e49bec5d0b0d15384526cb261000bf33..b018082b7703b07285a0ba4717f25da9
for (ServerLevel world : this.console.getAllLevels()) {
world.serverLevelData.setDifficulty(config.difficulty);
world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
@@ -911,6 +912,7 @@ public final class CraftServer implements Server {
@@ -920,6 +921,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
@@ -478,7 +478,7 @@ index a173b6b0e49bec5d0b0d15384526cb261000bf33..b018082b7703b07285a0ba4717f25da9
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -926,6 +928,7 @@ public final class CraftServer implements Server {
@@ -935,6 +937,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -486,7 +486,7 @@ index a173b6b0e49bec5d0b0d15384526cb261000bf33..b018082b7703b07285a0ba4717f25da9
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2384,6 +2387,18 @@ public final class CraftServer implements Server {
@@ -2461,6 +2464,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report