testserver/CraftBukkit-Patches/0152-Added-isUnbreakable-an...

144 lines
5.3 KiB
Diff
Raw Normal View History

2015-02-26 10:40:16 +00:00
From 0f300b295556cc29bc782834d3b27123f2c71767 Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:35:16 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
2015-02-18 10:24:40 +00:00
index fbe1c59..e2d9a7a 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
2015-02-15 01:52:33 +00:00
@@ -212,6 +212,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
static final ItemMetaKey ATTRIBUTES_UUID_LOW = new ItemMetaKey("UUIDLeast");
2015-02-15 01:52:33 +00:00
@Specific(Specific.To.NBT)
2015-02-18 10:24:40 +00:00
static final ItemMetaKey HIDEFLAGS = new ItemMetaKey("HideFlags", "ItemFlags");
2015-02-15 01:52:33 +00:00
+ @Specific(Specific.To.NBT)
+ static final ItemMetaKey UNBREAKABLE = new ItemMetaKey("Unbreakable"); // Spigot
private String displayName;
private List<String> lore;
2015-02-15 01:52:33 +00:00
@@ -244,6 +246,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
this.attributes = meta.attributes;
2015-02-15 01:52:33 +00:00
this.hideFlag = meta.hideFlag;
this.unhandledTags.putAll(meta.unhandledTags);
+ spigot.setUnbreakable( meta.spigot.isUnbreakable() ); // Spigot
}
CraftMetaItem(NBTTagCompound tag) {
2015-02-15 01:52:33 +00:00
@@ -446,6 +449,12 @@ class CraftMetaItem implements ItemMeta, Repairable {
unhandledTags.put(key, tag.get(key));
}
}
+ // Spigot start
+ if ( tag.hasKey( UNBREAKABLE.NBT ) )
+ {
+ spigot.setUnbreakable( tag.getBoolean( UNBREAKABLE.NBT ) );
+ }
+ // Spigot end
}
static Map<Enchantment, Integer> buildEnchantments(NBTTagCompound tag, ItemMetaKey key) {
2015-02-15 01:52:33 +00:00
@@ -499,6 +508,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
}
}
}
2015-02-15 01:52:33 +00:00
+
+ // Spigot start
+ Boolean unbreakable = SerializableMeta.getObject( Boolean.class, map, UNBREAKABLE.BUKKIT, true );
+ if ( unbreakable != null )
+ {
+ spigot.setUnbreakable( unbreakable );
+ }
+ // Spigot end
}
static Map<Enchantment, Integer> buildEnchantments(Map<String, Object> map, ItemMetaKey key) {
2015-02-15 01:52:33 +00:00
@@ -534,6 +551,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
2015-01-18 18:17:11 +00:00
}
applyEnchantments(enchantments, itemTag, ENCHANTMENTS);
2015-01-18 18:17:11 +00:00
+
+ // Spigot start
+ if ( spigot.isUnbreakable() )
+ {
+ itemTag.setBoolean( UNBREAKABLE.NBT, true );
+ }
+ // Spigot end
+
2015-01-18 18:17:11 +00:00
if (hasRepairCost()) {
itemTag.setInt(REPAIR.NBT, repairCost);
2015-02-15 01:52:33 +00:00
@@ -597,7 +622,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@Overridden
boolean isEmpty() {
2015-02-15 01:52:33 +00:00
- return !(hasDisplayName() || hasEnchants() || hasLore() || hasAttributes() || hasRepairCost() || !unhandledTags.isEmpty() || hideFlag != 0);
+ return !(hasDisplayName() || hasEnchants() || hasLore() || hasAttributes() || hasRepairCost() || !unhandledTags.isEmpty() || hideFlag != 0 || spigot.isUnbreakable()); // Spigot
}
public String getDisplayName() {
2015-02-15 01:55:54 +00:00
@@ -760,7 +785,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
&& (this.hasAttributes() ? that.hasAttributes() && this.attributes.equals(that.attributes) : !that.hasAttributes())
&& (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost())
2015-02-15 01:55:54 +00:00
&& (this.unhandledTags.equals(that.unhandledTags))
2015-02-15 01:52:33 +00:00
- && (this.hideFlag == that.hideFlag);
+ && (this.hideFlag == that.hideFlag)
+ && (this.spigot.isUnbreakable() == that.spigot.isUnbreakable()); // Spigot
}
/**
2015-02-15 01:55:54 +00:00
@@ -788,6 +814,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
hash = 61 * hash + (hasRepairCost() ? this.repairCost : 0);
2015-02-15 01:55:54 +00:00
hash = 61 * hash + unhandledTags.hashCode();
2015-02-15 01:52:33 +00:00
hash = 61 * hash + hideFlag;
2015-01-18 18:23:17 +00:00
+ hash = 61 * hash + (spigot.isUnbreakable() ? 1231 : 1237); // Spigot
return hash;
}
2015-02-15 01:55:54 +00:00
@@ -831,6 +858,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
2015-01-18 18:17:11 +00:00
if (hasRepairCost()) {
builder.put(REPAIR.BUKKIT, repairCost);
}
2015-01-18 18:17:11 +00:00
+
+ // Spigot start
+ if ( spigot.isUnbreakable() )
+ {
+ builder.put( UNBREAKABLE.BUKKIT, true );
+ }
+ // Spigot end
+
2015-01-18 18:17:11 +00:00
2015-02-15 01:52:33 +00:00
Set<String> hideFlags = new HashSet<String>();
for (ItemFlag hideFlagEnum : getItemFlags()) {
2015-02-15 01:55:54 +00:00
@@ -903,6 +938,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
2015-01-18 18:17:11 +00:00
synchronized (HANDLED_TAGS) {
if (HANDLED_TAGS.isEmpty()) {
HANDLED_TAGS.addAll(Arrays.asList(
2015-02-15 01:55:54 +00:00
+ UNBREAKABLE.NBT, // Spigot
DISPLAY.NBT,
REPAIR.NBT,
ATTRIBUTES.NBT,
@@ -928,6 +964,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
// Spigot start
private final Spigot spigot = new Spigot()
{
+ private boolean unbreakable;
+
+ @Override
+ public void setUnbreakable(boolean setUnbreakable)
+ {
+ unbreakable = setUnbreakable;
+ }
+
+ @Override
+ public boolean isUnbreakable()
+ {
+ return unbreakable;
+ }
};
@Override
--
2.1.0