Fix duplicated BlockPistonRetractEvent call (#7111)

1 files changed, 44 insertions, 0 deletions

diff --git a/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch
new file mode 100644
index 0000000000..7503eb2684
--- /dev/null
+++ b/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Wed, 20 Jan 2021 14:23:37 -0600
+Subject: [PATCH] Allow adding items to BlockDropItemEvent
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index afb6eb856d22845716351d5be7eff5991da72dd3..ee0e27500187d695ac6cfaf5fb5d2e844f230b32 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -395,13 +395,30 @@ public class CraftEventFactory {
+     }
+ 
+     public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List<ItemEntity> items) {
+-        BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), Lists.transform(items, (item) -> (org.bukkit.entity.Item) item.getBukkitEntity()));
++        // Paper start
++        List<Item> list = new ArrayList<>();
++        for (ItemEntity item : items) {
++            list.add((Item) item.getBukkitEntity());
++        }
++        BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), list);
++        // Paper end
+         Bukkit.getPluginManager().callEvent(event);
+ 
+         if (!event.isCancelled()) {
+-            for (ItemEntity item : items) {
+-                item.level.addFreshEntity(item);
++            // Paper start
++            for (Item bukkit : list) {
++                if (!bukkit.isValid()) {
++                    Entity item = ((org.bukkit.craftbukkit.entity.CraftItem) bukkit).getHandle();
++                    item.level.addFreshEntity(item);
++                }
++            }
++        } else {
++            for (Item bukkit : list) {
++                if (bukkit.isValid()) {
++                    bukkit.remove();
++                }
+             }
++            // Paper end
+         }
+     }
+