13
0
geforkt von Mirrors/Paper
Paper/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch

35 Zeilen
1.5 KiB
Diff

From 863ebbfe00939702cab6e4f7c0b1c99a3987f54a 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
index bf8fbac4e..21603953c 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
@@ -2341,7 +2341,20 @@ public abstract class EntityLiving extends Entity {
2016-11-17 03:23:38 +01:00
ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.activeItem.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
this.a(this.cz(), itemstack);
2016-03-19 17:57:19 +01:00
// CraftBukkit end
2016-11-17 03:23:38 +01:00
+
2016-03-19 17:57:19 +01:00
+ // 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
+
2016-11-17 03:23:38 +01:00
this.cF();
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.11.0
2016-03-19 17:57:19 +01:00