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

40 lines
1.6 KiB
Diff
Raw Normal View History

2016-04-02 04:08:40 +02:00
From f0f2dc3bddcddafe88517f3d615380b059c4f1c6 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-03-31 02:50:23 +02:00
index 54a0808..4b9e65b 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-03-31 02:50:23 +02:00
@@ -2222,12 +2222,25 @@ public abstract class EntityLiving extends Entity {
2016-03-19 17:57:19 +01: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
}
}
--
2016-03-31 02:50:23 +02:00
2.8.0
2016-03-19 17:57:19 +01:00