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

[Auto] Updated Upstream (Bukkit)

Browse source 
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:
23c1a2ba Deprecate ItemStack durability methods in favour of ItemMeta Damageable as they are being frequently used incorrectly.
This commit is contained in:
Aikar 2018-08-25 08:34:37 -04:00
parent af53179713
commit da126a405e
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 75065c61ba95680cd9e1db23b402a094d141b616 Mon Sep 17 00:00:00 2001
From a7fd9a66c2babbdf94e302b868bbfd98e4fc6761 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
@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
You must replace the language file embedded in the server jar.
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index 045c26d9..47bbc0f9 100644
index 3012aec2..63dd1b32 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -145,5 +145,15 @@ public interface ItemFactory {
@ -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 4940e726..e52a39ec 100644
index fa9a06fc..78029ca6 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -571,5 +571,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -580,5 +580,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public ItemStack ensureServerConversions() {
return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
}