Update upstream
This commit is contained in:
parent
4608731dca
commit
9a17bddf12
16 changed files with 70 additions and 70 deletions
|
@ -1,4 +1,4 @@
|
|||
From 34ff6fed0aafab40ec06d9c768117a5c1b4f2d4e Mon Sep 17 00:00:00 2001
|
||||
From 02c74afa96de75233566264502c5989c25f93eef Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 5 Jun 2018 22:59:50 -0400
|
||||
Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
|||
Allows you to determine how long it takes to use a usable/consumable item
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index ca7a958f..a240311e 100644
|
||||
index b1d0778f..4385ca79 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -574,5 +574,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -575,5 +575,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
public String getI18NDisplayName() {
|
||||
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue