Custom replacement for eaten items
This commit is contained in:
44
Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
Normal file
44
Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||||
|
Date: Sun, 21 Jun 2015 15:05:21 -0400
|
||||||
|
Subject: [PATCH] Custom replacement for eaten items
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
|
||||||
|
+++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
|
||||||
|
@@ -0,0 +0,0 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
|
||||||
|
private static final HandlerList handlers = new HandlerList();
|
||||||
|
private boolean isCancelled = false;
|
||||||
|
private ItemStack item;
|
||||||
|
+ private ItemStack replacement; // Paper
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param player the player consuming
|
||||||
|
@@ -0,0 +0,0 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ /**
|
||||||
|
+ * Return the custom item stack that will replace the consumed item, or null if no
|
||||||
|
+ * custom replacement has been set (which means the default replacement will be used).
|
||||||
|
+ */
|
||||||
|
+ public ItemStack getReplacement() {
|
||||||
|
+ return this.replacement;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Set a custom item stack to replace the consumed item. Pass null to clear any custom
|
||||||
|
+ * stack that has been set and use the default replacement.
|
||||||
|
+ */
|
||||||
|
+ public void setReplacement(ItemStack replacement) {
|
||||||
|
+ this.replacement = replacement;
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
public boolean isCancelled() {
|
||||||
|
return this.isCancelled;
|
||||||
|
}
|
||||||
|
--
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
|
@@ -0,0 +0,0 @@ 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
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
--
|
||||||
Reference in New Issue
Block a user