From 6dfe0496bd7e4bd3e2b0923122fc795d72a3ec0f Mon Sep 17 00:00:00 2001
From: Jason <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 20 Jun 2021 22:12:04 -0700
Subject: [PATCH] Fix PlayerDropItemEvent using wrong item (#5924)

Co-authored-by: Spottedleaf <spottedleaf@users.noreply.github.com>
---
 ...PlayerDropItemEvent-using-wrong-item.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 patches/server/0716-Fix-PlayerDropItemEvent-using-wrong-item.patch

diff --git a/patches/server/0716-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0716-Fix-PlayerDropItemEvent-using-wrong-item.patch
new file mode 100644
index 000000000..af70eddb7
--- /dev/null
+++ b/patches/server/0716-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Sun, 20 Jun 2021 21:55:59 -0700
+Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index d286d88a3c3f93dbfa92de9421e320c92cd96350..1bccd932851045c374e3092d33dc77fab680d0db 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -709,6 +709,11 @@ public abstract class Player extends LivingEntity {
+             }
+ 
+             double d0 = this.getEyeY() - 0.30000001192092896D;
++            // Paper start
++            ItemStack tmp = stack.copy();
++            stack.setCount(0);
++            stack = tmp;
++            // Paper end
+             ItemEntity entityitem = new ItemEntity(this.level, this.getX(), d0, this.getZ(), stack);
+ 
+             entityitem.setPickUpDelay(40);