diff options
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityItem.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java index e4b95267..5003452c 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -122,6 +122,10 @@ public class EntityItem extends Entity { return entityitem.a(this); } else if (entityitem.itemStack.count + this.itemStack.count > entityitem.itemStack.getMaxStackSize()) { return false; + // CraftBukkit start - don't merge items with enchantments + } else if (entityitem.itemStack.hasEnchantments() || this.itemStack.hasEnchantments()) { + return false; + // CraftBukkit end } else { entityitem.itemStack.count += this.itemStack.count; entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay); |