From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 17 Sep 2020 00:36:05 +0100 Subject: [PATCH] Extend block drop capture to capture all items added to the world diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java index 4b564d36135e9dbdbb57a95791f89aefd180457b..485b609bb5387b0f8a46c1201177cdc6d183ad91 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -385,10 +385,12 @@ public class PlayerInteractManager { // return true; // CraftBukkit } // CraftBukkit start + java.util.List itemsToDrop = world.captureDrops; // Paper - store current list + world.captureDrops = null; // Paper - Remove this earlier so that we can actually drop stuff if (event.isDropItems()) { - org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, world.captureDrops); + org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref } - world.captureDrops = null; + //world.captureDrops = null; // Paper - move up // Drop event experience if (flag && event != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index 6286ef81cb5ef95c4d5e0c384e73fbece0a096f6..5b0b6edfa790918e56399ff6c83f3feb6e5aca49 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1177,6 +1177,13 @@ public class WorldServer extends World implements GeneratorAccessSeed { } else if (this.isUUIDTaken(entity)) { return false; } else { + // Paper start - capture all item additions to the world + if (captureDrops != null && entity instanceof EntityItem) { + captureDrops.add((EntityItem) entity); + return true; + } + // Paper end + if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) { return false; }