Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@173bd93c [ci/skip] Rebuild patches
PaperMC/Paper@a47cb98c Add check for null player name in Team methods (#13468)
PaperMC/Paper@ebf50865 Expand wateranimal-spawn-height config for nautilus (#13488)
PaperMC/Paper@179626d5 Fix a few inverted checks for skulls (#13502)
PaperMC/Paper@5fa4be93 feature: expose mannequin poses (#13429)
PaperMC/Paper@1fd9d085 Fix backward compat for World#setPVP (#13503)
PaperMC/Paper@350fd5e3 Prevent negative anger level for neutral mobs (#13504)
PaperMC/Paper@575df562 Add zip error reporting to PaperPluginClassLoader (#13505)
PaperMC/Paper@51239f4b Fix usage message on spigot reload command (#13494)
PaperMC/Paper@ede8d0df Format paper-api mob goals in debug renderer (#13495)
PaperMC/Paper@444a2ba1 Change thrown trident item to use copy of ItemStack of count 1 (#13394)
PaperMC/Paper@93e81bfc Add support for loading plugins from extra directories (#13447)
This commit is contained in:
granny
2026-01-04 14:09:31 -08:00
parent 605b2bfe31
commit 6238ebf386
7 changed files with 22 additions and 22 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/Level.java
+++ b/net/minecraft/world/level/Level.java
@@ -166,11 +_,55 @@
@@ -165,11 +_,55 @@
}
// Paper end - add paper world config
@@ -56,7 +56,7 @@
public CraftWorld getWorld() {
return this.world;
}
@@ -846,6 +_,8 @@
@@ -845,6 +_,8 @@
// Paper end - getblock optimisations - cache world height/sections
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -65,7 +65,7 @@
this.generator = generator;
this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
@@ -2091,4 +_,14 @@
@@ -2090,4 +_,14 @@
return this.moonrise$getEntityLookup().getEntityCount(); // Paper - rewrite chunk system
}
// Paper end - allow patching this logic