Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-20 07:57:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix regression in item priority conversion

Browse Source
This commit is contained in:
md_5 2018-08-12 08:04:52 +10:00
parent a0a27e5876
commit b47946ff19
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
View File

@ -20,6 +20,7 @@ import net.minecraft.server.DynamicOpsNBT;
import net.minecraft.server.IBlockData; import net.minecraft.server.IBlockData;
import net.minecraft.server.IBlockState; import net.minecraft.server.IBlockState;
import net.minecraft.server.Item; import net.minecraft.server.Item;
import net.minecraft.server.Items;
import net.minecraft.server.MinecraftKey; import net.minecraft.server.MinecraftKey;
import net.minecraft.server.NBTBase; import net.minecraft.server.NBTBase;
import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagCompound;
@ -406,6 +407,10 @@ public class CraftLegacy {
// Preconditions.checkState(newId.contains("minecraft:"), "Unknown new material for " + matData); // Preconditions.checkState(newId.contains("minecraft:"), "Unknown new material for " + matData);
Item newMaterial = Item.REGISTRY.get(new MinecraftKey(newId)); Item newMaterial = Item.REGISTRY.get(new MinecraftKey(newId));
if (newMaterial == Items.AIR) {
continue;
}
materialToItem.put(matData, newMaterial); materialToItem.put(matData, newMaterial);
if (!itemToMaterial.containsKey(newMaterial)) { if (!itemToMaterial.containsKey(newMaterial)) {
itemToMaterial.put(newMaterial, matData); itemToMaterial.put(newMaterial, matData);