summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
index 15f24e9d..d98e0730 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
@@ -109,6 +109,13 @@ public class CraftLegacy {
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()) {
// Try exact match first
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 item;
}