OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-09 19:49:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Switch around item conversion code as well

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2018-08-11 20:19:12 +10:00
parent c21a237a3f
commit 8a4ae7cde3
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
paper-server/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;
} }