From f7e397621ad86bf29ae49067d614517aa8c21760 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 29 Sep 2021 03:12:40 +0100 Subject: [PATCH] Revert "Legacy data should look for legacy materials (Fixes #6618)" (Fixes #6664) This reverts commit 0d19cd7241ad0321d5301c45a7f35d0f61aaf0de. --- ...ata-should-look-for-legacy-materials.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 patches/api/0332-Legacy-data-should-look-for-legacy-materials.patch diff --git a/patches/api/0332-Legacy-data-should-look-for-legacy-materials.patch b/patches/api/0332-Legacy-data-should-look-for-legacy-materials.patch deleted file mode 100644 index 71377a026..000000000 --- a/patches/api/0332-Legacy-data-should-look-for-legacy-materials.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Fri, 17 Sep 2021 09:26:06 +0100 -Subject: [PATCH] Legacy data should look for legacy materials - - -diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 59a026d80b0a0a4890becf98efdbe5325b2c622a..240728d1d4376cb3aa83613085fbc69fa8b5f0df 100644 ---- a/src/main/java/org/bukkit/inventory/ItemStack.java -+++ b/src/main/java/org/bukkit/inventory/ItemStack.java -@@ -492,7 +492,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor - - Material type; - if (version < 0) { -- type = Material.getMaterial(Material.LEGACY_PREFIX + (String) args.get("type")); -+ type = Material.getMaterial(Material.LEGACY_PREFIX + (String) args.get("type"), true); - - byte dataVal = (type != null && type.getMaxDurability() == 0) ? (byte) damage : 0; // Actually durable items get a 0 passed into conversion - type = Bukkit.getUnsafe().fromLegacy(new MaterialData(type, dataVal), true);