Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fcedb49 Update spark-paper
PaperMC/Paper@956b3d1 Ensure MaterialChoice materials are items (#11325)
PaperMC/Paper@5625051 Prevent duplicate pickup event for piglins (#11322)
PaperMC/Paper@94444ce Fix incorrect timestamp in region file header recalculation (#11318)
PaperMC/Paper@5b2c43e Remove set damage lootable item function from compasses (#11317)
PaperMC/Paper@5167856 Fix despawn ranges by defaulting to an ellipsoid shape (#11312)
PaperMC/Paper@e2da65c Deprecate API relating to menu title changes (#11309)
PaperMC/Paper@ad4c524 Properly destroy placed blocks on the end platform (#11292)
PaperMC/Paper@374d9c8 Add a method to reset Lodestone compasses back to normal ones (#11308)
PaperMC/Paper@dd8c70a Ensure TabCompleteEvent always has a mutable backing list. (#11302)
PaperMC/Paper@a7b8d95 Add enchantment seed update API (#11282)
PaperMC/Paper@789a267 Re-implement maxLeashDistance world conf and call missing event (#11301)
This commit is contained in:
granny
2024-08-25 16:07:56 -07:00
parent ef12ede0a3
commit a61db94175
7 changed files with 19 additions and 19 deletions

View File

@@ -17,7 +17,7 @@ index 24507ece498ccaa2bed7b4ab53ae9c90e734ad54..cc770ba7f87fcb1e9027b4f120210809
private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index b45cefa0455ee5634b0b719bf93f7ab728d63eb0..349e9121d72f572e3e54e98aea50489f02fa4522 100644
index ebf2541c0d17c0940d78162a4015145bbebc51cf..0d93a8cbf15fa84f422d61adddb420ba5dcb226a 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -146,6 +146,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -85,7 +85,7 @@ index b45cefa0455ee5634b0b719bf93f7ab728d63eb0..349e9121d72f572e3e54e98aea50489f
}
@Override
@@ -1756,6 +1784,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1753,6 +1781,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
this.playAttackSound();
}