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

39 lines
1.6 KiB
Diff
Raw Normal View History

From 2ffc2bf91c0006ca2a77e6be164fbeabac4721c6 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
2016-07-13 06:22:58 +02:00
index 89e6ef5..ad320c2 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
2016-07-13 06:22:58 +02:00
@@ -2261,12 +2261,24 @@ public abstract class EntityLiving extends Entity {
2016-06-09 05:57:14 +02:00
ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.bo.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
2016-03-19 17:57:19 +01:00
// CraftBukkit end
+ // Paper start - save the default replacement item and change it if necessary
+ final ItemStack defaultReplacement = itemstack;
+ if (event.getReplacement() != null) {
+ itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
+ }
+ // Paper end
+
if (itemstack != null && itemstack.count == 0) {
itemstack = null;
}
2016-06-09 05:57:14 +02:00
this.a(this.cy(), itemstack);
this.cE();
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.9.3
2016-03-19 17:57:19 +01:00