[Auto] Updated Upstream (Bukkit)

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:
28237f03 SPIGOT-4330: Improve isSimilar for legacy stacks
This commit is contained in:
Aikar 2018-08-29 21:54:31 -04:00
parent f8b40558fd
commit 5e7e79880e
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
5 changed files with 16 additions and 16 deletions

View file

@ -1,4 +1,4 @@
From 91f63506cf54c56acf226e072a806b25bede75c9 Mon Sep 17 00:00:00 2001
From e45b4d932c1cf570cf43366467210ead1d75ef6c 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 78029ca6..972b945d 100644
index c3cb1247f..26ab1278b 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -591,5 +591,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -593,5 +593,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public String getI18NDisplayName() {
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
}