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:
PaperMC/Paper@e574412 Replace ConfiguredStructure api with Structure (#8642)
PaperMC/Paper@a172880 Update ForgeFlower to 2.0.627.2, fixes dev bundle not applying with Java 19 runtime
PaperMC/Paper@4151f75 /paper entity list QOL improvements (#8876)
PaperMC/Paper@8a815a0 Fix rendering for translatable death messages (#8534)
PaperMC/Paper@d30cda1 Add TeleportFlags (#8855)
PaperMC/Paper@3dcf4e4 Add EntityFertilizeEggEvent (#8041)
PaperMC/Paper@f2075c4 Take in account waterlogged block for the event (#8623)
PaperMC/Paper@e5e75dd Include previous spawn angle in SpawnChangeEvent (#8606)
PaperMC/Paper@541753b Fix HumanEntity#drop not updating the client inventory (#6761)
This commit is contained in:
granny
2023-03-05 03:32:31 -08:00
parent 3940c828a6
commit ade1ed1d98
31 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@ index ad4fdbdcf09f30d10e61ccf47f8fb9ce6bd92e73..ca6a2fee12ac8a89dae57aa2787462f1
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 42299fd6ae663b01bb5f010b96887caa744dcb96..816f906f98adc180f37d2b216628e576ac837448 100644
index e5f6740dfe7abb77ee3a4af9c2b53a014819c7e1..a8fe157c54b758db73639b21d7ef0fd646034af6 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -173,6 +173,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -105,10 +105,10 @@ index 42299fd6ae663b01bb5f010b96887caa744dcb96..816f906f98adc180f37d2b216628e576
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 be998ee2d790ded8dfbeb20d92ba70594a5baafa..234ba3e20fd79040c1386a5c5a47a924b3d42164 100644
index 9d15cb8151a4008061c5788cbf4f4fa494cfe49d..fdb314838159f77b3fb12d61e74d12f582fb2bcf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -962,6 +962,7 @@ public final class CraftServer implements Server {
@@ -961,6 +961,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 be998ee2d790ded8dfbeb20d92ba70594a5baafa..234ba3e20fd79040c1386a5c5a47a924
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))
@@ -977,6 +978,7 @@ public final class CraftServer implements Server {
@@ -976,6 +977,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -124,7 +124,7 @@ index be998ee2d790ded8dfbeb20d92ba70594a5baafa..234ba3e20fd79040c1386a5c5a47a924
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -992,6 +994,7 @@ public final class CraftServer implements Server {
@@ -991,6 +993,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 be998ee2d790ded8dfbeb20d92ba70594a5baafa..234ba3e20fd79040c1386a5c5a47a924
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2752,6 +2755,18 @@ public final class CraftServer implements Server {
@@ -2751,6 +2754,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}