SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
Aikar
2018-07-23 18:57:54 -04:00
parent ceedd8c4f1
commit 77c51f1785
16 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-API-Patches/Add-getI18NDisplayName-API.patch
View File

@@ -28,7 +28,7 @@ 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
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

2
Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch
View File

@@ -5,7 +5,7 @@ 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
@@ -0,0 +0,0 @@ package org.bukkit.inventory;

2
Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch
View File

@@ -6,7 +6,7 @@ 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
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

2
Spigot-API-Patches/ensureServerConversions-API.patch
View File

@@ -28,7 +28,7 @@ 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
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {