From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 28 May 2021 12:24:45 -0500 Subject: [PATCH] Fix advancement triggers on entity death This fixes PaperMC/Paper#3729 and PaperMC/Paper#4252 Paper changes logical order revolving around making the EntityDeathEvent cancellable. Reordering this logic has ended up with entity equipment being cleared _before_ advancement criteria can run, causing things like killing raid captains not giving the voluntary exile advancement. This fixes the issue by storing a copy of the equipment in a new field just before doing the death event logic where the equipment is cleared and then restoring it back to the entity just before the criterion triggers run and then finally clearing the equipment again right after the criterion is done. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index c4865a08e40205bd17697b039769fd8615b24744..0b8393a3d4202c8c57c5a63142c3ede8a487c595 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1658,10 +1658,13 @@ public abstract class LivingEntity extends Entity { } // Paper start + List> equipmentSnapshotBefore = this.cloneEquipment(); // Purpur org.bukkit.event.entity.EntityDeathEvent deathEvent = this.dropAllDeathLoot(source); if (deathEvent == null || !deathEvent.isCancelled()) { if (this.deathScore >= 0 && entityliving != null) { + this.restoreEquipment(equipmentSnapshotBefore); // Purpur entityliving.awardKillScore(this, this.deathScore, source); + this.clearEquipment(); // Purpur } if (this.isSleeping()) { @@ -2527,6 +2530,12 @@ public abstract class LivingEntity extends Entity { @Override public abstract void setItemSlot(EquipmentSlot slot, ItemStack stack); + // Purpur start + public abstract List> cloneEquipment(); + public abstract void restoreEquipment(List> list); + public abstract void clearEquipment(); + // Purpur end + protected void verifyEquippedItem(ItemStack stack) { CompoundTag nbttagcompound = stack.getTag(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java index dcec19d6323697f8469a7f595e989954c5e3f224..4601df22a3ced8752b6aff9f052e564a24466ce4 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1019,6 +1019,41 @@ public abstract class Mob extends LivingEntity { } + // Purpur start + public List> cloneEquipment() { + List> list = new java.util.ArrayList<>(); + List handItems = new java.util.ArrayList<>(); + for (ItemStack item : this.handItems) { + handItems.add(item.copy()); + } + list.add(handItems); + List armorItems = new java.util.ArrayList<>(); + for (ItemStack item : this.armorItems) { + armorItems.add(item.copy()); + } + list.add(armorItems); + return list; + } + + public void restoreEquipment(List> list) { + this.handItems.clear(); + List handItems = list.get(0); + for (int i = 0; i < handItems.size(); i++) { + this.handItems.set(i, handItems.get(1)); + } + this.armorItems.clear(); + List armorItems = list.get(1); + for (int i = 0; i < armorItems.size(); i++) { + this.armorItems.set(i, armorItems.get(i)); + } + } + + public void clearEquipment() { + this.handItems.clear(); + this.armorItems.clear(); + } + // Purpur end + @Override protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) { super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops); diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java index c9a44a4765f43b9c0247ed1005f4c13469bdee95..6d08c8c31a32ea38f06410fbaddf19b95bec7c6f 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -205,6 +205,41 @@ public class ArmorStand extends LivingEntity { this.noTickEquipmentDirty = true; // Paper - Allow equipment to be updated even when tick disabled } + // Purpur start + public List> cloneEquipment() { + List> list = new java.util.ArrayList<>(); + List handItems = new java.util.ArrayList<>(); + for (ItemStack item : this.handItems) { + handItems.add(item.copy()); + } + list.add(handItems); + List armorItems = new java.util.ArrayList<>(); + for (ItemStack item : this.armorItems) { + armorItems.add(item.copy()); + } + list.add(armorItems); + return list; + } + + public void restoreEquipment(List> list) { + this.handItems.clear(); + List handItems = list.get(0); + for (int i = 0; i < handItems.size(); i++) { + this.handItems.set(i, handItems.get(1)); + } + this.armorItems.clear(); + List armorItems = list.get(1); + for (int i = 0; i < armorItems.size(); i++) { + this.armorItems.set(i, armorItems.get(1)); + } + } + + public void clearEquipment() { + this.handItems.clear(); + this.armorItems.clear(); + } + // Purpur end + @Override public boolean canTakeItem(ItemStack stack) { net.minecraft.world.entity.EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java index dfe78217add616c761ba53fb4999cc6593863d2d..b9ce1021f12f14ba45c49890d8d529b733bae532 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1993,6 +1993,52 @@ public abstract class Player extends LivingEntity { } + // Purpur start + public List> cloneEquipment() { + List> list = new java.util.ArrayList<>(); + List invItems = new java.util.ArrayList<>(); + for (ItemStack item : this.inventory.items) { + invItems.add(item.copy()); + } + list.add(invItems); + List armorItems = new java.util.ArrayList<>(); + for (ItemStack item : this.inventory.armor) { + armorItems.add(item.copy()); + } + list.add(armorItems); + List offhandItems = new java.util.ArrayList<>(); + for (ItemStack item : this.inventory.offhand) { + offhandItems.add(item.copy()); + } + list.add(offhandItems); + return list; + } + + public void restoreEquipment(List> list) { + this.inventory.items.clear(); + List invItems = list.get(0); + for (int i = 0; i < invItems.size(); i++) { + this.inventory.items.set(i, invItems.get(1)); + } + this.inventory.armor.clear(); + List armorItems = list.get(1); + for (int i = 0; i < armorItems.size(); i++) { + this.inventory.armor.set(i, armorItems.get(1)); + } + this.inventory.offhand.clear(); + List offhandItems = list.get(2); + for (int i = 0; i < offhandItems.size(); i++) { + this.inventory.offhand.set(i, offhandItems.get(1)); + } + } + + public void clearEquipment() { + this.inventory.items.clear(); + this.inventory.armor.clear(); + this.inventory.offhand.clear(); + } + // Purpur end + public boolean addItem(ItemStack stack) { this.equipEventAndSound(stack); return this.inventory.add(stack);