papermc/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch

From 8986c076e68f65f37e3e8fb065e471d9247f348a 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 d6475338b5..4409588fbb 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2817,12 +2817,13 @@ public abstract class EntityLiving extends Entity {
 
     protected void q() {
         if (!this.activeItem.isEmpty() && this.isHandRaised()) {
+            PlayerItemConsumeEvent event = null; // Paper
             this.b(this.activeItem, 16);
             // CraftBukkit start - fire PlayerItemConsumeEvent
             ItemStack itemstack;
             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()) {
@@ -2837,9 +2838,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.dp();
+            // 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.21.0