[Auto] Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: b1d149cf SPIGOT-4489: NOTE_BLOCK incorrectly has BlockStateMeta
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 995ff17669ecc2be7d3a6b7350ec7d2e4bf7c74c Mon Sep 17 00:00:00 2001
|
||||
From 28e876d491ba820cc07a15dae470563eba5b7e31 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 5fc0283b22..be5f922cb6 100644
|
||||
index 52041caed..f5fa58d6c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
@@ -295,4 +295,10 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
@@ -294,4 +294,10 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
|
||||
return ((CraftMetaItem) meta).updateMaterial(material);
|
||||
}
|
||||
@@ -22,5 +22,5 @@ index 5fc0283b22..be5f922cb6 100644
|
||||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user