2016-11-22 14:38:58 +11:00
|
|
|
From 378adab1ba36476ea50786d6fbf0d556d6e0af6b Mon Sep 17 00:00:00 2001
|
2014-08-15 18:12:50 -04:00
|
|
|
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
|
2016-11-22 14:38:58 +11:00
|
|
|
index 6155502..da70757 100644
|
2014-08-15 18:12:50 -04:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
2016-11-22 14:38:58 +11:00
|
|
|
@@ -242,7 +242,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
2015-01-30 09:36:43 +00:00
|
|
|
this.lore = new ArrayList<String>(meta.lore);
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (meta.hasEnchants()) {
|
|
|
|
+ if (meta.enchantments != null) { // Spigot
|
|
|
|
this.enchantments = new HashMap<Enchantment, Integer>(meta.enchantments);
|
|
|
|
}
|
|
|
|
|
2016-11-22 14:38:58 +11:00
|
|
|
@@ -588,7 +588,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
2014-08-15 18:12:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2016-11-22 14:38:58 +11:00
|
|
|
@@ -675,7 +675,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
2014-08-15 18:12:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
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() {
|
|
|
|
--
|
2016-11-17 12:41:12 +11:00
|
|
|
2.9.3
|
2014-08-15 18:12:50 -04:00
|
|
|
|