Initial work on 1.14 pre-5

This commit is contained in:
Shane Freeder
2019-04-23 05:47:07 +01:00
parent 85e05732b2
commit a84170f6a0
261 changed files with 912 additions and 1013 deletions

View File

@ -5,19 +5,19 @@ 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 345dc8bdc..1b19f8215 100644
index 7a4ace35..72e268c1 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;
import com.google.common.collect.ImmutableMap;
import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.List; // Paper
import java.util.Map;
+import java.util.Set;
+import java.util.Set; // Paper
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.Material;
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
// Requires access to NMS
return ensureServerConversions().getMaxItemUseDuration();