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

Fix merge conflicts.

Browse source
This commit is contained in:
md_5 2015-02-15 12:52:33 +11:00 • committed by Zach Brown
parent e1a6979f1a
commit 6008bb8fab
7 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 3f2bae5366aa36f78b4070aebecd75e9ae8ffb4c Mon Sep 17 00:00:00 2001
From e999c1532150871324ff0b5b1a609a5434249328 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 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 4681262..5d5cb92 100644
index 28871ab..3c98575 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -715,4 +715,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -788,4 +788,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
return HANDLED_TAGS;
}
}