diff --git a/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch b/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
index f6741ec6c0..238df3cf00 100644
--- a/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
+++ b/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
@@ -14,8 +14,21 @@ erasing the NBT Tag.
 
 On copy, run conversion post ItemMeta apply.
 
+diff --git a/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java b/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
+index 4a8820e68..27fb802bf 100644
+--- a/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
++++ b/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
+@@ -0,0 +0,0 @@ public class DataInspectorBlockEntity implements DataInspector {
+                 boolean flag;
+ 
+                 if (s1 == null) {
+-                    DataInspectorBlockEntity.a.warn("Unable to resolve BlockEntity for ItemInstance: {}", new Object[] { s});
++                    //DataInspectorBlockEntity.a.warn("Unable to resolve BlockEntity for ItemInstance: {}", new Object[] { s}); // Paper - no need to nag about an ok condition
+                     flag = false;
+                 } else {
+                     flag = !nbttagcompound2.hasKey("id");
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+index 66973051a..1218c005e 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -0,0 +0,0 @@ public final class ItemStack {
@@ -45,7 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.save(savedStack);
              MinecraftServer.getServer().getDataConverterManager().a(DataConverterTypes.ITEM_INSTANCE, savedStack); // PAIL: convert
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+index 4afd3a99a..a862e946c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index 13a7d13345..0fb60ba2a4 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -56,6 +56,7 @@ import CommandScoreboard
 import CommandWhitelist
 import DataBits
 import DataConverterMaterialId
+import DataInspectorBlockEntity
 import DefinedStructure
 import EULA
 import EntitySquid