Paper/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch

From b6694f092eb5700091be881e5bf8b231aaf1d2ef Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400
Subject: [PATCH] Custom replacement for eaten items


diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6e8adb65c..14097275c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2894,9 +2894,10 @@ public abstract class EntityLiving extends Entity {
                 this.b(this.activeItem, 16);
                 // CraftBukkit start - fire PlayerItemConsumeEvent
                 ItemStack itemstack;
+                PlayerItemConsumeEvent event = null; // Paper
                 if (this instanceof EntityPlayer) {
                     org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.activeItem);
-                    PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem);
+                    event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper
                     world.getServer().getPluginManager().callEvent(event);
 
                     if (event.isCancelled()) {
@@ -2911,9 +2912,20 @@ public abstract class EntityLiving extends Entity {
                     itemstack = this.activeItem.a(this.world, this);
                 }
 
+                // Paper start - save the default replacement item and change it if necessary
+                final ItemStack defaultReplacement = itemstack;
+                if (event != null && event.getReplacement() != null) {
+                    itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
+                }
+                // Paper end
                 this.a(this.getRaisedHand(), itemstack);
                 // CraftBukkit end
                 this.dH();
+                // Paper start - if the replacement is anything but the default, update the client inventory
+                if (this instanceof EntityPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
+                    ((EntityPlayer) this).getBukkitEntity().updateInventory();
+                }
+                // Paper end
             }
 
         }
-- 
2.24.0