aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch')
-rw-r--r--patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch
new file mode 100644
index 0000000000..9009d631f8
--- /dev/null
+++ b/patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+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/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index 2ba432f7be370ce1a5861e90de9541d76acdcfd2..85c0a80f00f5968b684b3609fbe56197e4aeb202 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -1292,6 +1292,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+ // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
+ return false;
+ } else {
++ // Paper start - capture all item additions to the world
++ if (captureDrops != null && entity instanceof net.minecraft.world.entity.item.ItemEntity) {
++ captureDrops.add((net.minecraft.world.entity.item.ItemEntity) entity);
++ return true;
++ }
++ // Paper end
+ // SPIGOT-6415: Don't call spawn event when reason is null. For example when an entity teleports to a new world.
+ if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
+ return false;
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+index 431ff490760f54be76847c7b370dbbb4b65de102..1b45c1483a7ebad47162483b51036f9dfcdf62f6 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+@@ -428,10 +428,12 @@ public class ServerPlayerGameMode {
+ // return true; // CraftBukkit
+ }
+ // CraftBukkit start
++ java.util.List<net.minecraft.world.entity.item.ItemEntity> itemsToDrop = level.captureDrops; // Paper - store current list
++ level.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, level.captureDrops);
++ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref
+ }
+- level.captureDrops = null;
++ //world.captureDrops = null; // Paper - move up
+
+ // Drop event experience
+ if (flag && event != null) {