mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-24 18:07:39 +01:00
461353e2cb
This was useful when plugins first started upgrading to uuid because each plugin would implement their own way for grabbing uuid's from mojang. Because none of them shared the result they would quickly hit the limits on the api causing the conversion to either fail or pause for long periods of time. The global api cache was a (very hacky) way to force all plugins to share a cache but caused a few issues with plugins that expected a full implementation of the HTTPURLConnection. Due to the fact that most servers/plugins have updated now it seems to be a good time to remove this as its usefulness mostly has expired.
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From 4dd56e8358ed665e09bf8b459e06a77b5bd60999 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 02f727a..99d3226 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
@@ -230,7 +230,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
|
this.lore = new ArrayList<String>(meta.lore);
|
|
}
|
|
|
|
- if (meta.hasEnchants()) {
|
|
+ if (meta.enchantments != null) { // Spigot
|
|
this.enchantments = new HashMap<Enchantment, Integer>(meta.enchantments);
|
|
}
|
|
|
|
@@ -531,7 +531,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;
|
|
}
|
|
|
|
@@ -622,7 +622,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
|
|
|