check if items in item frames have a custom name

steve4744 · Dec 16, 2023 · cc33786 · cc33786
1 parent 21626a9
commit cc33786
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/io/github/steve4744/whatisthis/data/DataHandler.java b/src/main/java/io/github/steve4744/whatisthis/data/DataHandler.java
@@ -213,7 +213,11 @@ public String getEntityDisplayName(Entity entity, Player player) {
 		} else if (entity.getType() == EntityType.ITEM_FRAME || entity.getType() == EntityType.GLOW_ITEM_FRAME) {
 			final ItemFrame iframe = (ItemFrame) entity;
 			if (plugin.getSettings().isItemFrameContentEnabled() && iframe.getItem().getType() != Material.AIR) {
-				targetName = translateItemName(iframe.getItem().getType().toString(), player);
+				if (iframe.getItem().getItemMeta() != null && iframe.getItem().getItemMeta().hasDisplayName()) {
+					targetName = iframe.getItem().getItemMeta().getDisplayName();
+				} else {
+					targetName = translateItemName(iframe.getItem().getType().toString(), player);
+				}
 			}
 		}