39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 57b0eac9f25991ca4dc7112f5b831c2da86614c0 Mon Sep 17 00:00:00 2001
|
|
From: drXor <mcyoung@mit.edu>
|
|
Date: Fri, 15 Aug 2014 18:11:09 -0400
|
|
Subject: [PATCH] Remove uneeded validation
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
index aaf56bf..7f3339c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
@@ -510,7 +510,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
|
}
|
|
|
|
static void applyEnchantments(Map<Enchantment, Integer> enchantments, NBTTagCompound tag, ItemMetaKey key) {
|
|
- if (enchantments == null || enchantments.size() == 0) {
|
|
+ if (enchantments == null /*|| enchantments.size() == 0*/) { // Spigot - remove size check
|
|
return;
|
|
}
|
|
|
|
@@ -601,7 +601,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
|
}
|
|
|
|
public boolean removeEnchant(Enchantment ench) {
|
|
- return hasEnchants() && enchantments.remove(ench) != null;
|
|
+ // Spigot start
|
|
+ boolean b = hasEnchants() && enchantments.remove( ench ) != null;
|
|
+ if ( enchantments != null && enchantments.isEmpty() )
|
|
+ {
|
|
+ this.enchantments = null;
|
|
+ }
|
|
+ return b;
|
|
+ // Spigot end
|
|
}
|
|
|
|
public boolean hasEnchants() {
|
|
--
|
|
2.1.0
|
|
|