From bfaa56a1a33a379fdda3d38619130764ed4ad235 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 7c8774d228..633fe836dd 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -510,6 +510,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { }); } + // Paper start - process inventory + private static void processKeep(org.bukkit.event.entity.PlayerDeathEvent event, NonNullList inv) { + List itemsToKeep = event.getItemsToKeep(); + if (inv == null) { + // remainder of items left in toKeep - plugin added stuff on death that wasn't in the initial loot? + if (!itemsToKeep.isEmpty()) { + for (org.bukkit.inventory.ItemStack itemStack : itemsToKeep) { + event.getEntity().getInventory().addItem(itemStack); + } + } + + return; + } + + for (int i = 0; i < inv.size(); ++i) { + ItemStack item = inv.get(i); + if (EnchantmentManager.shouldNotDrop(item) || itemsToKeep.isEmpty() || item.isEmpty()) { + inv.set(i, ItemStack.NULL_ITEM); + continue; + } + + final org.bukkit.inventory.ItemStack bukkitStack = item.getBukkitStack(); + boolean keep = false; + final Iterator iterator = itemsToKeep.iterator(); + while (iterator.hasNext()) { + final org.bukkit.inventory.ItemStack itemStack = iterator.next(); + if (bukkitStack.equals(itemStack)) { + iterator.remove(); + keep = true; + break; + } + } + + if (!keep) { + inv.set(i, ItemStack.NULL_ITEM); + } + } + } + // Paper end + @Override public void die(DamageSource damagesource) { boolean flag = this.world.getGameRules().getBoolean(GameRules.SHOW_DEATH_MESSAGES); @@ -594,7 +634,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.releaseShoulderEntities(); // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory. if (!event.getKeepInventory()) { - this.inventory.clear(); + // Paper start - replace logic + for (NonNullList inv : this.inventory.getComponents()) { + processKeep(event, inv); + } + processKeep(event, null); + // Paper end } this.setSpectatorTarget(this); // Remove spectated target -- 2.22.0