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
|
2022-03-16 16:57:51 +01:00
|
|
|
index 75b3f8a68bb7017c25ffd4190f9969c066bc5e3f..174f0f1bbe32e8753e360db0194c5ec20fbf22bd 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
|
2022-03-16 16:57:51 +01:00
|
|
|
@@ -2175,7 +2175,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
|
2022-03-13 08:47:54 +01:00
|
|
|
index de0b885ebafecb37ef8be127362f76d487ff92ae..909f5c26ca149687c03688c33c241e549f19a3e9 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
|
2022-03-01 06:43:03 +01:00
|
|
|
@@ -713,6 +713,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
|
2022-03-13 08:47:54 +01:00
|
|
|
ItemEntity entityitem = new ItemEntity(this.level, this.getX(), d0, this.getZ(), itemstack);
|
2021-06-21 07:12:04 +02:00
|
|
|
|
|
|
|
entityitem.setPickUpDelay(40);
|