More work towards 1.14 pre5

This commit is contained in:
Shane Freeder
2019-04-24 02:00:24 +01:00
parent a84170f6a0
commit 43b4755c1b
21 changed files with 537 additions and 740 deletions

View File

@@ -837,7 +837,7 @@ index ea90a01830..59e7d907ef 100644
if (throwable != null) {
completablefuture.completeExceptionally(throwable);
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index c4aa0152c8..6e44e58c58 100644
index 73dd802205..9ed7f8ede4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {