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

@@ -78,7 +78,7 @@
}
public boolean causeFallDamage(double fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2573,7 +_,7 @@
@@ -2572,7 +_,7 @@
output.putBoolean("Bukkit.invisible", this.persistentInvisibility);
}
// SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
@@ -87,7 +87,7 @@
output.putInt("Bukkit.MaxAirSupply", this.getMaxAirSupply());
}
output.putInt("Spigot.ticksLived", this.totalEntityAge); // Paper
@@ -2660,6 +_,11 @@
@@ -2659,6 +_,11 @@
output.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -99,7 +99,7 @@
} catch (Throwable var7) {
CrashReport crashReport = CrashReport.forThrowable(var7, "Saving entity NBT");
CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being saved");
@@ -2780,6 +_,9 @@
@@ -2779,6 +_,9 @@
}
freezeLocked = input.getBooleanOr("Paper.FreezeLock", false);
// Paper end
@@ -109,7 +109,7 @@
} catch (Throwable var7) {
CrashReport crashReport = CrashReport.forThrowable(var7, "Loading entity NBT");
CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being loaded");
@@ -3043,6 +_,7 @@
@@ -3042,6 +_,7 @@
if (this.isAlive() && this instanceof Leashable leashable2) {
if (leashable2.getLeashHolder() == player) {
if (!this.level().isClientSide()) {
@@ -117,7 +117,7 @@
// Paper start - EntityUnleashEvent
if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent(
leashable2, player, hand, !player.hasInfiniteMaterials(), true
@@ -3473,15 +_,18 @@
@@ -3472,15 +_,18 @@
return Vec3.directionFromRotation(this.getRotationVector());
}
@@ -137,7 +137,7 @@
}
}
}
@@ -4221,7 +_,7 @@
@@ -4220,7 +_,7 @@
}
public boolean canUsePortal(boolean allowPassengers) {
@@ -146,7 +146,7 @@
}
public boolean canTeleport(Level fromLevel, Level toLevel) {
@@ -4740,6 +_,12 @@
@@ -4739,6 +_,12 @@
return Mth.lerp(partialTick, this.yRotO, this.yRot);
}
@@ -159,7 +159,7 @@
// Paper start - optimise collisions
public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
if (this.touchingUnloadedChunk()) {
@@ -5160,7 +_,7 @@
@@ -5159,7 +_,7 @@
}
public float maxUpStep() {