Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7485: Allow air entity items since required for Vanilla logic

Browse Source
This commit is contained in:
md_5 2023-09-22 07:14:27 +10:00
parent 5dfd33dc27
commit 069495671e
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nms-patches/net/minecraft/world/entity/item/EntityItem.patch
View File

@ -64,12 +64,7 @@
this.discard(); this.discard();
} }
@@ -255,10 +275,15 @@ @@ -259,6 +279,11 @@
private static void merge(EntityItem entityitem, ItemStack itemstack, ItemStack itemstack1) {
ItemStack itemstack2 = merge(itemstack, itemstack1, 64);
- entityitem.setItem(itemstack2);
+ if (!itemstack2.isEmpty()) entityitem.setItem(itemstack2); // CraftBukkit - don't set empty stacks
} }
private static void merge(EntityItem entityitem, ItemStack itemstack, EntityItem entityitem1, ItemStack itemstack1) { private static void merge(EntityItem entityitem, ItemStack itemstack, EntityItem entityitem1, ItemStack itemstack1) {
@ -140,11 +135,3 @@
if (this.pickupDelay == 0 && (this.target == null || this.target.equals(entityhuman.getUUID())) && entityhuman.getInventory().add(itemstack)) { if (this.pickupDelay == 0 && (this.target == null || this.target.equals(entityhuman.getUUID())) && entityhuman.getInventory().add(itemstack)) {
entityhuman.take(this, i); entityhuman.take(this, i);
if (itemstack.isEmpty()) { if (itemstack.isEmpty()) {
@@ -390,6 +460,7 @@
}
public void setItem(ItemStack itemstack) {
+ com.google.common.base.Preconditions.checkArgument(!itemstack.isEmpty(), "Cannot drop air"); // CraftBukkit
this.getEntityData().set(EntityItem.DATA_ITEM, itemstack);
}