Upstream update

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

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/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 33e82f5377..0952bf0b82 100644
index 4f230975aa..e52014fd8f 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -0,0 +0,0 @@ public final class ItemStack {