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

Update upstream

Browse Source
This commit is contained in:
Aikar
2017-06-25 20:26:00 -04:00
parent b8fb29dc77
commit 46e300045a
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ index 3f11e4279..ebb3e04bc 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 2bf7e9f35..523c14df0 100644
index 724da6772..935cbe867 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.annotation.RetentionPolicy;
@@ -238,8 +238,8 @@ index 2bf7e9f35..523c14df0 100644
- Map<Enchantment, Integer> enchantments = new HashMap<Enchantment, Integer>(ench.size());
+ EnchantmentMap enchantments = new EnchantmentMap(); // Paper
for (Map.Entry<?, ?> entry : ench.entrySet()) {
Enchantment enchantment = Enchantment.getByName(entry.getKey().toString());
// Doctor older enchants
String enchantKey = entry.getKey().toString();
@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
}