mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
57dd397155
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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From e29404b4426b7fb849d91fd1f6c23d29eaddc250 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 5 Jun 2018 23:00:29 -0400
|
|
Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
|
|
|
Allows you to determine how long it takes to use a usable/consumable item
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
|
index 854cffe6c9..641a52b968 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
|
@@ -548,6 +548,7 @@ public final class ItemStack {
|
|
this.getItem().b(this, world, entityhuman);
|
|
}
|
|
|
|
+ public int getItemUseMaxDuration() { return k(); } // Paper - OBFHELPER
|
|
public int k() {
|
|
return this.getItem().f_(this);
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
index 3dd912abe3..a41be8fdae 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
@@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack {
|
|
return (handle == null) ? Material.AIR.getMaxStackSize() : handle.getItem().getMaxStackSize();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public int getMaxItemUseDuration() {
|
|
+ return handle == null ? 0 : handle.getItemUseMaxDuration();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void addUnsafeEnchantment(Enchantment ench, int level) {
|
|
Validate.notNull(ench, "Cannot add null enchantment");
|
|
--
|
|
2.26.2
|
|
|