Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream CB

Browse Source
This commit is contained in:
Zach Brown
2018-08-27 11:07:22 -04:00
parent 7dff42b4ae
commit 9ac7577de3
23 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0195-Implement-ensureServerConversions-API.patch
View File

@@ -1,4 +1,4 @@
From 9eec798ed47a25bd4d1975b924ebe06a5a6d873a Mon Sep 17 00:00:00 2001
From 9f5de8050e5b90630710b446ab20e501afadc369 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 22:43:12 -0400
Subject: [PATCH] Implement ensureServerConversions API
@@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
to ensure it meets latest minecraft expectations.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index 6998fddc5a..f7e11412a5 100644
index 5fc0283b2..be5f922cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -289,4 +289,10 @@ public final class CraftItemFactory implements ItemFactory {
@@ -295,4 +295,10 @@ public final class CraftItemFactory implements ItemFactory {
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
return ((CraftMetaItem) meta).updateMaterial(material);
}