Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-19 23:47:55 +01:00
Code Issues Projects Releases Wiki Activity

Switch around item conversion code as well

Browse Source
This commit is contained in:
md_5 2018-08-11 20:19:12 +10:00
parent 96778caabb
commit a0a27e5876
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,13 @@ public class CraftLegacy {
MaterialData materialData = new MaterialData(material, (byte) data); MaterialData materialData = new MaterialData(material, (byte) data);
// First try matching item
Item convertedItem = materialToItem.get(materialData);
if (convertedItem != null) {
return convertedItem;
}
// Fallback to matching block
if (material.isBlock()) { if (material.isBlock()) {
// Try exact match first // Try exact match first
IBlockData converted = materialToData.get(materialData); IBlockData converted = materialToData.get(materialData);
@ -123,12 +130,6 @@ public class CraftLegacy {
} }
} }
// Fallback to matching item
Item convertedItem = materialToItem.get(materialData);
if (convertedItem != null) {
return convertedItem;
}
// Return existing item // Return existing item
return item; return item;
} }