Update upstream

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

View File

@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
to ensure it meets latest minecraft expectations.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index 59d2685dc8..27a264f549 100644
index 0fb3c238a..e98e1ed72 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {