Upstream merge
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 93c1cbc882a2a4e4f98139641e6ac3426eca9234 Mon Sep 17 00:00:00 2001
|
||||
From 9fcbcf0747c1cadbf81ef239b7d80c46b2ef767d Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 2 Jun 2013 15:10:56 +1000
|
||||
Subject: [PATCH] Skeleton API Implementations
|
||||
@@ -124,10 +124,10 @@ index 16a35b8..c1879f4 100644
|
||||
+ // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
index 9e426ba..661bc0c 100644
|
||||
index 40d7fca..23cf3b9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
@@ -790,4 +790,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||
@@ -791,4 +791,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||
return HANDLED_TAGS;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user