mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 15:49:00 +01:00
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
|
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);
|