From 0000000000000000000000000000000000000000 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/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java index 6d723445f80fc6db5880f658098046de5f13f563..dc0b6b9a22b31940cc997431af644ea9c772f8cb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -724,6 +724,46 @@ public class ServerPlayer extends Player { }); } + // 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 (EnchantmentHelper.hasVanishingCurse(item) || itemsToKeep.isEmpty() || item.isEmpty()) { + inv.set(i, ItemStack.EMPTY); + 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.EMPTY); + } + } + } + // Paper end + @Override public void die(DamageSource source) { boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES); @@ -809,7 +849,12 @@ public class ServerPlayer extends Player { this.dropExperience(); // 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.getInventory().clearContent(); + // Paper start - replace logic + for (NonNullList inv : this.getInventory().compartments) { + processKeep(event, inv); + } + processKeep(event, null); + // Paper end } this.setCamera(this); // Remove spectated target