core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Legacy data should look for legacy materials (Fixes #6618)

This commit is contained in:
Shane Freeder 2021-09-17 09:35:02 +01:00
parent 0680f4f448
commit 0d19cd7241
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patches/api/0332-Legacy-data-should-look-for-legacy-materials.patch Normal file
View File

@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
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);