geforkt von Mirrors/Paper
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
52 Zeilen
1.9 KiB
Diff
52 Zeilen
1.9 KiB
Diff
From e9241513c3d597d3dd268f27a6900f94f094c092 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 c2793f3ef..373f4b5b5 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
|
|
@@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private boolean isCancelled = false;
|
|
private ItemStack item;
|
|
+ @Nullable private ItemStack replacement; // Paper
|
|
|
|
/**
|
|
* @param player the player consuming
|
|
@@ -58,6 +59,29 @@ 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).
|
|
+ *
|
|
+ * @return The custom item stack that will replace the consumed item or null
|
|
+ */
|
|
+ @Nullable
|
|
+ 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.
|
|
+ *
|
|
+ * @param replacement Replacement item to set, null to clear any custom stack and use default
|
|
+ */
|
|
+ public void setReplacement(@Nullable ItemStack replacement) {
|
|
+ this.replacement = replacement;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public boolean isCancelled() {
|
|
return this.isCancelled;
|
|
--
|
|
2.25.1
|
|
|