2021-06-21 07:12:04 +02:00
|
|
|
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
|
|
|
|
|
|
|
|
|
2021-08-06 18:46:25 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2023-09-23 01:42:59 +02:00
|
|
|
index 0abc9dfd73b3cb16b29bdbcc40f0d0ea1c022f34..2265259b24ae27a85beea1d47ec2c1bae6baa2a7 100644
|
2021-08-06 18:46:25 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2023-09-23 01:42:59 +02:00
|
|
|
@@ -2282,7 +2282,7 @@ public class ServerPlayer extends Player {
|
2021-08-06 18:46:25 +02:00
|
|
|
|
|
|
|
if (retainOwnership) {
|
|
|
|
if (!itemstack1.isEmpty()) {
|
|
|
|
- this.awardStat(Stats.ITEM_DROPPED.get(itemstack1.getItem()), stack.getCount());
|
|
|
|
+ this.awardStat(Stats.ITEM_DROPPED.get(itemstack1.getItem()), itemstack1.getCount()); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
this.awardStat(Stats.DROP);
|
2021-06-21 07:12:04 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
2023-09-22 09:24:44 +02:00
|
|
|
index dee00042a780b053cd094081874aad221abf1b2b..786ef24e97cfb96ddee2be9e02272e6f572cd64d 100644
|
2021-06-21 07:12:04 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
2023-09-22 09:24:44 +02:00
|
|
|
@@ -730,6 +730,11 @@ public abstract class Player extends LivingEntity {
|
2021-06-21 07:12:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
double d0 = this.getEyeY() - 0.30000001192092896D;
|
|
|
|
+ // Paper start
|
2022-03-13 08:47:54 +01:00
|
|
|
+ ItemStack tmp = itemstack.copy();
|
|
|
|
+ itemstack.setCount(0);
|
|
|
|
+ itemstack = tmp;
|
2021-06-21 07:12:04 +02:00
|
|
|
+ // Paper end
|
2023-06-08 04:04:01 +02:00
|
|
|
ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), d0, this.getZ(), itemstack);
|
2021-06-21 07:12:04 +02:00
|
|
|
|
|
|
|
entityitem.setPickUpDelay(40);
|