40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
|
From 1e28f461809ca1edf8b1477f6d1ed15cc277c07f 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 34abdd4..1f2a8ee 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||
|
|
@@ -2214,12 +2214,25 @@ public abstract class EntityLiving extends Entity {
|
||
|
|
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.2
|
||
|
|
|