Update upstream B/CB
--- work/Bukkit Submodule work/Bukkit 538ceaff..d6b23768: > SPIGOT-5534: ItemStack copy constructor can cause legacy layer to load --- work/CraftBukkit Submodule work/CraftBukkit efd6cf55..a81f6ed3: > SPIGOT-5532: Material.values() yields an exception
This commit is contained in:
parent
79710332e3
commit
19ff55ef0d
7 changed files with 23 additions and 23 deletions
|
@ -1,4 +1,4 @@
|
|||
From 0a804e62de45bd9c8d9c3b8a716863a961555d6a Mon Sep 17 00:00:00 2001
|
||||
From 8a8c8d26dae2e332dd944219e0decc1c342d210e 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 65aa1c4e..bb5a4712 100644
|
||||
index 8adf9399..7d2c5747 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -619,5 +619,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -621,5 +621,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
public String getI18NDisplayName() {
|
||||
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
|
||||
}
|
||||
|
@ -24,5 +24,5 @@ index 65aa1c4e..bb5a4712 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.25.0.windows.1
|
||||
2.25.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue