1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf 2020-01-21 18:02:07 -08:00 committed by Zach
parent d4ae43fc00
commit 19de9af63c
624 changed files with 2369 additions and 2370 deletions

View file

@ -1,4 +1,4 @@
From 21b8eb1d0a8a24b3b4611a98d2ec0f320ca3cbc7 Mon Sep 17 00:00:00 2001
From 0a804e62de45bd9c8d9c3b8a716863a961555d6a 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 9526cfe02..f129121e5 100644
index 65aa1c4e..bb5a4712 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -603,5 +603,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -619,5 +619,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public String getI18NDisplayName() {
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
}
@ -24,5 +24,5 @@ index 9526cfe02..f129121e5 100644
// Paper end
}
--
2.21.0
2.25.0.windows.1