twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-05-19 05:30:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix ArmorStand items for canceled EntityDeathEvent (#12288)

Browse Source 
Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com>
This commit is contained in:
Pedro 2025-05-02 17:19:15 -04:00 committed by GitHub
parent 2bd84f6f0e
commit 6f1f5b67e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
paper-server/patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch
View File

@ -198,7 +198,7 @@
}
return true;
@@ -400,31 +_,34 @@
@@ -400,31 +_,42 @@
float health = this.getHealth();
health -= damageAmount;
if (health <= 0.5F) {
@ -231,13 +231,24 @@
+ // this.dropAllDeathLoot(level, damageSource); // CraftBukkit - moved down
for (EquipmentSlot equipmentSlot : EquipmentSlot.VALUES) {
ItemStack itemStack = this.equipment.set(equipmentSlot, ItemStack.EMPTY);
- ItemStack itemStack = this.equipment.set(equipmentSlot, ItemStack.EMPTY);
+ ItemStack itemStack = this.equipment.get(equipmentSlot); // Paper - move equipment removal past event call
if (!itemStack.isEmpty()) {
- Block.popResource(this.level(), this.blockPosition().above(), itemStack);
- }
- }
+ this.drops.add(new DefaultDrop(itemStack, stack -> Block.popResource(this.level(), this.blockPosition().above(), stack))); // CraftBukkit - add to drops // Paper - Restore vanilla drops behavior; mirror so we can destroy it later - though this call site was safe & spawn drops correctly}
}
}
+ return this.dropAllDeathLoot(level, damageSource); // CraftBukkit - moved from above // Paper
+ }
+ }
+ // Paper start - move equipment removal past event call
+ org.bukkit.event.entity.EntityDeathEvent event = this.dropAllDeathLoot(level, damageSource);
+ if (!event.isCancelled()) {
+ for (EquipmentSlot equipmentSlot : EquipmentSlot.VALUES) {
+ this.equipment.set(equipmentSlot, ItemStack.EMPTY);
+ }
+ }
+ return event;
+ // Paper end - move equipment removal past event call
}
private void playBrokenSound() {