testserver/Spigot-Server-Patches/0094-Custom-replacement-for...

40 lines
1.6 KiB
Diff
Raw Normal View History

From 1de7a4205fd60aa30189386d3bf85aef1ad29405 Mon Sep 17 00:00:00 2001
2016-03-19 16:57:19 +00: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
index 40abc3a..3e92dcc 100644
2016-03-19 16:57:19 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2016-03-20 01:20:25 +00:00
@@ -2214,12 +2214,25 @@ public abstract class EntityLiving extends Entity {
2016-03-19 16:57:19 +00:00
ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.bm.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
// 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;
}
this.a(this.ct(), itemstack);
this.cz();
+
+ // 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.7.4
2016-03-19 16:57:19 +00:00