mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-02 17:32:03 +01:00
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 @@ 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;
|
||
|
}
|
||
|
|
||
|
@@ -0,0 +0,0 @@ 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() {
|
||
|
--
|