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

From 0000000000000000000000000000000000000000 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/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index d483d552092c901fec262c43e488784d9cd8acb9..3c707ca6b56e89b671db6316d4db90a2903f33b4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3202,9 +3202,10 @@ public abstract class LivingEntity extends Entity {
                 this.triggerItemUseEffects(this.useItem, 16);
                 // CraftBukkit start - fire PlayerItemConsumeEvent
                 ItemStack itemstack;
+                PlayerItemConsumeEvent event = null; // Paper
                 if (this instanceof ServerPlayer) {
                     org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.useItem);
-                    PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem);
+                    event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper
                     level.getCraftServer().getPluginManager().callEvent(event);
 
                     if (event.isCancelled()) {
@@ -3218,6 +3219,13 @@ public abstract class LivingEntity extends Entity {
                 } else {
                     itemstack = this.useItem.finishUsingItem(this.level, 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
                 // CraftBukkit end
 
                 if (itemstack != this.useItem) {
@@ -3225,6 +3233,11 @@ public abstract class LivingEntity extends Entity {
                 }
 
                 this.stopUsingItem();
+                // Paper start - if the replacement is anything but the default, update the client inventory
+                if (this instanceof ServerPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
+                    ((ServerPlayer) this).getBukkitEntity().updateInventory();
+                }
+                // Paper end
             }
 
         }