mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream merge

Browse source
This commit is contained in:
Thinkofdeath 2015-01-18 18:17:11 +00:00 • committed by Zach Brown
parent 478838714f
commit 3c20eb4a97
2 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 4ab376f74dcf329d15853816a39474ca11e93961 Mon Sep 17 00:00:00 2001
From 337e55ae0f39587d271afff1d4aa561bbb536816 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,12 +124,12 @@ index 6361b44..fed7b4d 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 7ebb70b..e80fce2 100644
index 4681262..5d5cb92 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -713,4 +713,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -715,4 +715,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
return HANDLED_TAGS;
}
return HANDLED_TAGS;
}
+
+ // Spigot start
@ -192,5 +192,5 @@ index 5584353..8f5689f 100644
+ // Spigot end
}
--
2.1.0
1.9.5.msysgit.0