mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream

Browse source
This commit is contained in:
Aikar 2018-07-23 18:57:54 -04:00
parent 4608731dca
commit 9a17bddf12
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
16 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch
View file

@ -1,4 +1,4 @@
From 5576e3c1a73f5a51ee3e041d001a827252a8d724 Mon Sep 17 00:00:00 2001
From 3f49c33bedc491bb19580f5713bf536f366b931a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] Add getI18NDisplayName API
@ -28,10 +28,10 @@ index 045c26d9..47bbc0f9 100644
// Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 14b6b6b3..ca7a958f 100644
index 24a45189..b1d0778f 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -563,5 +563,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -564,5 +564,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public ItemStack ensureServerConversions() {
return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
}