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

Update upstream

Browse Source
This commit is contained in:
Aikar
2018-07-23 18:57:54 -04:00
parent 4608731dca
commit 9a17bddf12
16 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From ed06a3f52e0a0fd9899b4f5c9082bab768bc7c60 Mon Sep 17 00:00:00 2001
From 27d25274373a6f4533ce86ef73351e049c0f127b 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 59d2685dc8..27a264f549 100644
index 0fb3c238a..e98e1ed72 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -288,4 +288,10 @@ public final class CraftItemFactory implements ItemFactory {
@@ -287,4 +287,10 @@ public final class CraftItemFactory implements ItemFactory {
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
return ((CraftMetaItem) meta).updateMaterial(material);
}