mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
Upstream merge
This commit is contained in:
parent
a1b0dffb19
commit
da7c9b23b0
@ -1,17 +1,17 @@
|
|||||||
From f4436e6402a30548daeb29b6c7823fba788f27a4 Mon Sep 17 00:00:00 2001
|
From 82b400f5474b1e66d26150501a6c0f99291253fc Mon Sep 17 00:00:00 2001
|
||||||
From: libraryaddict <redwarfare@live.com>
|
From: libraryaddict <redwarfare@live.com>
|
||||||
Date: Fri, 22 Aug 2014 05:35:16 -0400
|
Date: Fri, 22 Aug 2014 05:35:16 -0400
|
||||||
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
|
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
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||||
index ad03b3b..cb5173f 100644
|
index fbe1c59..e2d9a7a 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||||
@@ -212,6 +212,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
@@ -212,6 +212,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||||
static final ItemMetaKey ATTRIBUTES_UUID_LOW = new ItemMetaKey("UUIDLeast");
|
static final ItemMetaKey ATTRIBUTES_UUID_LOW = new ItemMetaKey("UUIDLeast");
|
||||||
@Specific(Specific.To.NBT)
|
@Specific(Specific.To.NBT)
|
||||||
static final ItemMetaKey HIDEFLAGS = new ItemMetaKey("ItemFlags", "hideFlags");
|
static final ItemMetaKey HIDEFLAGS = new ItemMetaKey("HideFlags", "ItemFlags");
|
||||||
+ @Specific(Specific.To.NBT)
|
+ @Specific(Specific.To.NBT)
|
||||||
+ static final ItemMetaKey UNBREAKABLE = new ItemMetaKey("Unbreakable"); // Spigot
|
+ static final ItemMetaKey UNBREAKABLE = new ItemMetaKey("Unbreakable"); // Spigot
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user