Revert "Updated Upstream (Spigot) (#4745)"

This reverts commit e38eceb42a.
2020-11-09 00:09:37 +00:00
parent e38eceb42a
commit 611a0ee52d
393 changed files with 166 additions and 130 deletions
--- a/Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-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 a89a0b417b6adb021aefe52fc3de627320e30b80..c776f9bf65dedab951e3176bd74f854522503024 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -563,6 +563,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         });
-     }
- 
-+    // Paper start - process inventory
-+    private static void processKeep(org.bukkit.event.entity.PlayerDeathEvent event, NonNullList<ItemStack> inv) {
-+        List<org.bukkit.inventory.ItemStack> 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<org.bukkit.inventory.ItemStack> 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);
-@@ -652,7 +692,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         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.inventory.clear();
-+            // Paper start - replace logic
-+            for (NonNullList<ItemStack> inv : this.inventory.getComponents()) {
-+                processKeep(event, inv);
-+            }
-+            processKeep(event, null);
-+            // Paper end
-         }
- 
-         this.setSpectatorTarget(this); // Remove spectated target