From 408d2a55d6d1794d61d1e55728c5ce8d1c6ff487 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 12 Aug 2018 08:04:52 +1000
Subject: [PATCH] Fix regression in item priority conversion
By: md_5 <git@md-5.net>
---
.../main/java/org/bukkit/craftbukkit/util/CraftLegacy.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
index d98e0730d5..01ebbbca6c 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
@@ -20,6 +20,7 @@ import net.minecraft.server.DynamicOpsNBT;
import net.minecraft.server.IBlockData;
import net.minecraft.server.IBlockState;
import net.minecraft.server.Item;
+import net.minecraft.server.Items;
import net.minecraft.server.MinecraftKey;
import net.minecraft.server.NBTBase;
import net.minecraft.server.NBTTagCompound;
@@ -406,6 +407,10 @@ public class CraftLegacy {
// Preconditions.checkState(newId.contains("minecraft:"), "Unknown new material for " + matData);
Item newMaterial = Item.REGISTRY.get(new MinecraftKey(newId));
+ if (newMaterial == Items.AIR) {
+ continue;
+ }
+
materialToItem.put(matData, newMaterial);
if (!itemToMaterial.containsKey(newMaterial)) {
itemToMaterial.put(newMaterial, matData);