aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch')
-rw-r--r--patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch
new file mode 100644
index 0000000000..bf2c2519f2
--- /dev/null
+++ b/patches/server/0420-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 f079192644e3b366dc58c4a77c10cbbe65c25eca..17985c75deaa8d317ea4019f73eafe118d347f41 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -1230,6 +1230,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 - capture all item additions to the world
+ // 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 2f0d56c78584abe27ef050258827103fb60d5785..486d9c4dbe3ee23198eba7f34ea8b5f4e9048c0b 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+@@ -432,10 +432,12 @@ public class ServerPlayerGameMode {
+ // return true; // CraftBukkit
+ }
+ // CraftBukkit start
++ java.util.List<net.minecraft.world.entity.item.ItemEntity> itemsToDrop = this.level.captureDrops; // Paper - capture all item additions to the world
++ this.level.captureDrops = null; // Paper - capture all item additions to the world; Remove this earlier so that we can actually drop stuff
+ if (event.isDropItems()) {
+- org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, this.level.captureDrops);
++ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - capture all item additions to the world
+ }
+- this.level.captureDrops = null;
++ //this.level.captureDrops = null; // Paper - capture all item additions to the world; move up
+
+ // Drop event experience
+ if (flag && event != null) {