Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
This commit is contained in:
Jake Potrebic
2021-08-13 10:08:34 -07:00
committed by GitHub
parent 80836709e7
commit e942509e73
76 changed files with 152 additions and 253 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 5b2b6747768e638423c86ce13a419f5a3f63d30d..764ce055a28f355a205c67f60632cac1bd8eb182 100644
index 6dadec179459e606e96c858b5c8ba05e6cd12918..6a3da6993474a38e7f69b6da49bb11ab16b0f3d2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2161,7 +2161,7 @@ public class ServerPlayer extends Player {
@@ -2163,7 +2163,7 @@ public class ServerPlayer extends Player {
if (retainOwnership) {
if (!itemstack1.isEmpty()) {