Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17: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:
PaperMC/Paper@1e5d1db Call StructureGrowEvent for mangrove propagule (#8023)
PaperMC/Paper@385f313 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092)
PaperMC/Paper@fbb11db Add missing EntityDropItemEvent calls (#5674)
PaperMC/Paper@c879064 Call EntityDropItemEvent for goats dropping horns (#8094)
This commit is contained in:
BillyGalbreath
2022-07-04 15:39:33 -05:00
parent d1485fa5b6
commit ff0bea3098
40 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0004-Purpur-config-files.patch
View File

@@ -105,10 +105,10 @@ index 8bae26d296eb73642fa1a2f83ec1a28fadcade0c..2f98c6a031a4e08c8395c326d35b129c
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d93eb184f4 100644
index 42fe8f12b6c7c11a46fe9627a2a5a87ebea821c3..17ad3fb575444c36884202daffb685d03f0a5cb8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -957,6 +957,7 @@ public final class CraftServer implements Server {
@@ -959,6 +959,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -116,7 +116,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -972,6 +973,7 @@ public final class CraftServer implements Server {
@@ -974,6 +975,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -124,7 +124,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -987,6 +989,7 @@ public final class CraftServer implements Server {
@@ -989,6 +991,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -132,7 +132,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2722,6 +2725,18 @@ public final class CraftServer implements Server {
@@ -2729,6 +2732,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -152,7 +152,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 1b9e91b20dd9a9375a0a2a6a4d7a0bcdce9e7b1a..f9bd31f1cf8b7c98cfa7a3fb0be0bbb001a2ab1c 100644
index c55ae77807e0ec3698f0d0443caaf18928b41017..2fae47d9e75a33416e27b6a2256365540149a571 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -158,6 +158,14 @@ public class Main {