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

8
Spigot-API-Patches/0060-ensureServerConversions-API.patch
View file

@ -1,4 +1,4 @@
From b02d5605bac4c8543b6f9fb6935a997cb2fe4149 Mon Sep 17 00:00:00 2001
From 913761361c5a2b8da0f5eaa0ddfd7b6a18cc9ecc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] ensureServerConversions API
@ -28,10 +28,10 @@ index 762c43d6..045c26d9 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 73f79b22..14b6b6b3 100644
index 41a43053..24a45189 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -487,7 +487,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -488,7 +488,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
}
}
@ -45,7 +45,7 @@ index 73f79b22..14b6b6b3 100644
}
/**
@@ -545,4 +550,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -546,4 +551,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
return true;
}

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);
}

6
Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
View file

@ -1,4 +1,4 @@
From 34ff6fed0aafab40ec06d9c768117a5c1b4f2d4e Mon Sep 17 00:00:00 2001
From 02c74afa96de75233566264502c5989c25f93eef 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 ca7a958f..a240311e 100644
index b1d0778f..4385ca79 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -574,5 +574,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -575,5 +575,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public String getI18NDisplayName() {
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
}

6
Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
View file

@ -1,11 +1,11 @@
From 7cce1cf01bc05d8bbdbe79d43c1427c0acb7831d Mon Sep 17 00:00:00 2001
From ba60c4fe16615ca60be690c7bf4bb2bf30fd175f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 22 Jun 2018 22:59:18 -0400
Subject: [PATCH] ItemStack API additions for quantity/flags/lore
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index a240311e..c5befd8c 100644
index 4385ca79..7eb00104 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -2,7 +2,9 @@ package org.bukkit.inventory;
@ -27,7 +27,7 @@ index a240311e..c5befd8c 100644
/**
* Represents a stack of items
*/
@@ -582,5 +586,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -583,5 +587,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
// Requires access to NMS
return ensureServerConversions().getMaxItemUseDuration();
}