38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
index cac92ccacc9d5ff17c70ee266cf12bacce6242ea..2ac8b6ac38bdca26cddfb8652f13b0be0c4000fe 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
@@ -606,6 +606,7 @@ public final class ItemStack {
|
||
|
|
this.getItem().b(this, world, entityhuman);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public int getItemUseMaxDuration() { return k(); } // Paper - OBFHELPER
|
||
|
|
public int k() {
|
||
|
|
return this.getItem().e_(this);
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||
|
|
index 7221ac52c9f66ae0af6f6cbf15c8d47f9c0291a0..315addab147dfecf4aa88d32d154cefe850d0a78 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");
|