diff --git a/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java b/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java index ed8db5e6a..a2ac0aee1 100644 --- a/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java +++ b/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java @@ -160,7 +160,7 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt { if (context.getSessionData("tempName") != null) { final String stackData = getItemData(context); if (stackData != null) { - text += stackData; + text += "\n" + stackData; if (context.getSessionData("tempMeta") != null) { final LinkedHashMap map = (LinkedHashMap) context.getSessionData("tempMeta"); diff --git a/main/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java b/main/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java index 3503df84e..bbfad59d6 100644 --- a/main/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java +++ b/main/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java @@ -83,8 +83,13 @@ public class QuestMainPrompt extends QuestsEditorNumericPrompt { case 2: case 3: case 4: - case 5: return ChatColor.BLUE; + case 5: + if (context.getForWhom() instanceof Player) { + return ChatColor.BLUE; + } else { + return ChatColor.GRAY; + } case 6: if (plugin.getDependencies().getWorldGuardApi() != null) { return ChatColor.BLUE; @@ -131,9 +136,9 @@ public class QuestMainPrompt extends QuestsEditorNumericPrompt { } case 5: if (context.getForWhom() instanceof Player) { - return ChatColor.GRAY + Lang.get("questEditorBlockStart"); - } else { return ChatColor.YELLOW + Lang.get("questEditorBlockStart"); + } else { + return ChatColor.GRAY + Lang.get("questEditorBlockStart"); } case 6: if (plugin.getDependencies().getWorldGuardApi() != null) { diff --git a/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java b/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java index bf37c430a..72e0a217e 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java @@ -132,7 +132,11 @@ public class ItemListener implements Listener { if (plugin.canUseQuests(evt.getEnchanter().getUniqueId())) { final ItemStack enchantedItem = evt.getItem().clone(); enchantedItem.setAmount(1); - enchantedItem.addEnchantments(evt.getEnchantsToAdd()); + try { + enchantedItem.addEnchantments(evt.getEnchantsToAdd()); + } catch (final IllegalArgumentException e) { + // Ignore + } final Quester quester = plugin.getQuester(evt.getEnchanter().getUniqueId()); for (final Quest quest : plugin.getQuests()) { if (!quester.meetsCondition(quest, true)) {