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

Upstream update

Browse Source
This commit is contained in:
Aikar
2018-08-03 01:04:28 -04:00
parent 631614f5bd
commit e966ee5aef
8 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
View File

@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
ItemMeta API equivalents, and should deprecate the old API's.
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index e7b5daf28e..6e7b2e721d 100644
index 0c54eaa529..c7ef9c6890 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -0,0 +0,0 @@ import com.mojang.brigadier.StringReader;
@@ -204,7 +204,7 @@ index f4672b9a48..e2699564af 100644
static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index f10de8550c..f21c1e846d 100644
index 5464923759..94b19d1095 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -0,0 +0,0 @@ import java.lang.reflect.Constructor;