diff --git a/Spigot-Server-Patches/0197-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0197-Implement-ensureServerConversions-API.patch
index 8203d43d63..53bde78298 100644
--- a/Spigot-Server-Patches/0197-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0197-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From f1ddcf43d9f099679c60da978685f782b4548f1d Mon Sep 17 00:00:00 2001
+From ceb030382bed66093c058bf950dc62c7d3b9fb34 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 0fb3c238ae..e98e1ed72c 100644
+index 6998fddc5..f7e11412a 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 {
+@@ -289,4 +289,10 @@ public final class CraftItemFactory implements ItemFactory {
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
return ((CraftMetaItem) meta).updateMaterial(material);
}
diff --git a/Spigot-Server-Patches/0198-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0198-Implement-getI18NDisplayName.patch
index 5776832f29..759e07db9b 100644
--- a/Spigot-Server-Patches/0198-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0198-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 6211c63ca93cdb6b867189ed20e7fa477190bec6 Mon Sep 17 00:00:00 2001
+From 3f33d6f6fd24dc37b5a25d819eeb9c5db7ddd40f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:59:38 -0400
Subject: [PATCH] Implement getI18NDisplayName
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
You must replace the language file embedded in the server jar.
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 4361b2cee5..f81887c661 100644
+index 4361b2cee..f81887c66 100644
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -44,10 +44,12 @@ public class LocaleLanguage {
@@ -25,10 +25,10 @@ index 4361b2cee5..f81887c661 100644
return this.c(s);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index e98e1ed72c..35eb3181dd 100644
+index f7e11412a..3dbe9d81e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -292,5 +292,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -294,5 +294,18 @@ public final class CraftItemFactory implements ItemFactory {
public ItemStack ensureServerConversions(ItemStack item) {
return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
}
diff --git a/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch
index f9b01accbe..3a19794de3 100644
--- a/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 7a4c416b18e3ab55375b0cce3279f9fe20dd0ee7 Mon Sep 17 00:00:00 2001
+From 49bff188ac93c1d1401f4870e0a5dbadba2ae28f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 27 Jan 2018 17:04:14 -0500
Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,10 +13,10 @@ starting point for future additions in this area.
Fixes GH-559
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 35eb3181d..a69f98cd6 100644
+index 3dbe9d81e..22b9674da 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -183,6 +183,8 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -185,6 +185,8 @@ public final class CraftItemFactory implements ItemFactory {
return meta instanceof CraftMetaSpawnEgg ? meta : new CraftMetaSpawnEgg(meta);
case KNOWLEDGE_BOOK:
return meta instanceof CraftMetaKnowledgeBook ? meta : new CraftMetaKnowledgeBook(meta);
@@ -26,10 +26,10 @@ index 35eb3181d..a69f98cd6 100644
case CHEST:
case TRAPPED_CHEST:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8c0409797..83f89a236 100644
+index ed49a5828..70b05eeaa 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -392,6 +392,8 @@ public final class CraftItemStack extends ItemStack {
+@@ -394,6 +394,8 @@ public final class CraftItemStack extends ItemStack {
return new CraftMetaSpawnEgg(item.getTag());
case KNOWLEDGE_BOOK:
return new CraftMetaKnowledgeBook(item.getTag());
diff --git a/Spigot-Server-Patches/0316-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0316-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 3eb1cef323..c2e5468cdc 100644
--- a/Spigot-Server-Patches/0316-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0316-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 8eb9f1f3fa7924ec6fc84d4b18153c32faaee00f Mon Sep 17 00:00:00 2001
+From ae7939350e45292c194e58627882cd35417de85a Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com>
Date: Thu, 26 Jul 2018 14:10:23 +0200
Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8ca161f0ed..e9bef85c8b 100644
+index ad8a176d6..c9d1999a4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -514,7 +514,7 @@ public final class CraftItemStack extends ItemStack {
+@@ -516,7 +516,7 @@ public final class CraftItemStack extends ItemStack {
@Override
public boolean hasItemMeta() {
@@ -24,7 +24,7 @@ index 8ca161f0ed..e9bef85c8b 100644
static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index eb6cf1bb33..79ce3752e8 100644
+index eb6cf1bb3..79ce3752e 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
@@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.*;
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c0df4b82d3..4a24108665 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c0df4b82d380bea4fd66cc887a1476468e2301c4
+Subproject commit 4a241086654d1331eaf51c749306a04ae224e7f1