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

51 lines
2.3 KiB
Diff
Raw Normal View History

From 6aca1eb30fa703436f9e195e2a3b17c38c223f15 Mon Sep 17 00:00:00 2001
2016-03-19 17:57:19 +01:00
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
2018-03-26 02:06:44 +02:00
index 2aaeac324..7e2cc66d7 100644
2016-03-19 17:57:19 +01:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2018-03-26 02:06:44 +02:00
@@ -2377,12 +2377,13 @@ public abstract class EntityLiving extends Entity {
2017-01-14 09:11:12 +01:00
protected void v() {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
+ PlayerItemConsumeEvent event = null; // Paper
2017-05-14 20:05:01 +02:00
this.b(this.activeItem, 16);
2017-01-14 09:11:12 +01:00
// 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()) {
2018-03-26 02:06:44 +02:00
@@ -2397,9 +2398,21 @@ public abstract class EntityLiving extends Entity {
2017-01-14 09:11:12 +01:00
itemstack = this.activeItem.a(this.world, this);
}
2016-03-19 17:57:19 +01:00
+ // Paper start - save the default replacement item and change it if necessary
+ final ItemStack defaultReplacement = itemstack;
2017-01-14 09:11:12 +01:00
+ if (event != null && event.getReplacement() != null) {
2016-03-19 17:57:19 +01:00
+ itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
+ }
+ // Paper end
2017-01-14 09:11:12 +01:00
+
2017-06-08 16:16:51 +02:00
this.a(this.cH(), itemstack);
2017-01-14 09:11:12 +01:00
// CraftBukkit end
2017-06-08 16:16:51 +02:00
this.cN();
2016-03-19 17:57:19 +01:00
+
+ // 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();
+ }
}
}
--
2.18.0
2016-03-19 17:57:19 +01:00