geforkt von Mirrors/Paper
716db7fb5e
Helps with development to not need to cast as much... No clue why upstream makes some of the decisions they do....
50 Zeilen
2.3 KiB
Diff
50 Zeilen
2.3 KiB
Diff
From 1bc1148cbc2b01c71098683b2b89449f35791f7c 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 5363a2c704..03c6c77a60 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -2564,12 +2564,13 @@ public abstract class EntityLiving extends Entity {
|
|
|
|
protected void q() {
|
|
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
|
|
+ PlayerItemConsumeEvent event = null; // Paper
|
|
this.b(this.activeItem, 16);
|
|
// CraftBukkit start - fire PlayerItemConsumeEvent
|
|
ItemStack itemstack;
|
|
if (this instanceof EntityPlayer) {
|
|
org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.activeItem);
|
|
- PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem);
|
|
+ event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper
|
|
world.getServer().getPluginManager().callEvent(event);
|
|
|
|
if (event.isCancelled()) {
|
|
@@ -2584,9 +2585,20 @@ public abstract class EntityLiving extends Entity {
|
|
itemstack = this.activeItem.a(this.world, this);
|
|
}
|
|
|
|
+ // Paper start - save the default replacement item and change it if necessary
|
|
+ final ItemStack defaultReplacement = itemstack;
|
|
+ if (event != null && event.getReplacement() != null) {
|
|
+ itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
|
|
+ }
|
|
+ // Paper end
|
|
this.a(this.cU(), itemstack);
|
|
// CraftBukkit end
|
|
this.da();
|
|
+ // 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.18.0
|
|
|