Make command item missing-item error use display name if present

CitizensDev · May 7, 2024 · bb43940 · bb43940
1 parent 28e2e87
commit bb43940
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -117,7 +117,9 @@ private Transaction chargeCommandCosts(Player player, Hand hand, NPCCommand comm
             Transaction action = new ItemAction(command.itemCost).take(player, 1);
             if (!action.isPossible()) {
                 ItemStack stack = command.itemCost.get(0);
-                sendErrorMessage(player, CommandTraitError.MISSING_ITEM, null, Util.prettyEnum(stack.getType()),
+                sendErrorMessage(player, CommandTraitError.MISSING_ITEM, null,
+                        stack.getItemMeta().hasDisplayName() ? stack.getItemMeta().getDisplayName()
+                                : Util.prettyEnum(stack.getType()),
                         stack.getAmount());
             }
             txns.add(action);
@@ -148,7 +150,9 @@ private Transaction chargeGlobalCommandCosts(Player player, Hand hand) {
             Transaction action = new ItemAction(itemRequirements).take(player, 1);
             if (!action.isPossible()) {
                 ItemStack stack = itemRequirements.get(0);
-                sendErrorMessage(player, CommandTraitError.MISSING_ITEM, null, Util.prettyEnum(stack.getType()),
+                sendErrorMessage(player, CommandTraitError.MISSING_ITEM, null,
+                        stack.getItemMeta().hasDisplayName() ? stack.getItemMeta().getDisplayName()
+                                : Util.prettyEnum(stack.getType()),
                         stack.getAmount());
             }
             txns.add(action);