Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@75655ec Add Configuration for vertical Despawn Ranges (#11279)
PaperMC/Paper@0e73617 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11284)
PaperMC/Paper@66a97cc Update item data sanitization (#11227)
PaperMC/Paper@2e82fd2 Add even more Enchantment API (#11115)
PaperMC/Paper@57dd822 Leashable API (#10961)
PaperMC/Paper@8c3018a Fix Selector Arguments not working with permission (#11286)
PaperMC/Paper@4401748 Fix CraftBukkit drag system (#10703)
PaperMC/Paper@64c9ee6 Allow getting/setting the sign's editor uuid (#10637)
This commit is contained in:
granny
2024-08-17 20:35:59 -07:00
parent f5303959cd
commit 3510a9e559
8 changed files with 25 additions and 25 deletions

View File

@@ -1289,7 +1289,7 @@ index 273ba284ef4f515ac7ca276264e17e04cdbe5b2e..943b4e93d1cfbb6b5d933851b2494fb6
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 377f4311de40d702c53b0641376e6b2bddf33028..ff3d098d57d13d79d303e252874350e4b9ce161e 100644
index 3150041b72d3a4fe01a0ca6f2ddb3003f4edfff4..f17127b92115ed08ad5936d0be10ab8dd5b9bffb 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -370,13 +370,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1326,7 +1326,7 @@ index 377f4311de40d702c53b0641376e6b2bddf33028..ff3d098d57d13d79d303e252874350e4
}
protected Vec3i getPickupReach() {
@@ -946,48 +946,48 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -953,48 +953,48 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
return;
}
// Paper end - Allow nerfed mobs to jump and float