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

NOT FINISHED: Current progress, updated upstream

Browse Source
This commit is contained in:
Aikar
2018-07-18 00:52:33 -04:00
parent 87cdf6c201
commit 3d8746445e
30 changed files with 153 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From a267bc488bbe04958b64ce137b2a483737976473 Mon Sep 17 00:00:00 2001
From 941c7fed4bfadedf10f30caf187e3f86a43e1e0a 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 e305d663a..503dd5827 100644
index 59d2685dc..27a264f54 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -287,4 +287,10 @@ public final class CraftItemFactory implements ItemFactory {
@@ -288,4 +288,10 @@ public final class CraftItemFactory implements ItemFactory {
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
return ((CraftMetaItem) meta).updateMaterial(material);
}