Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct default return of item prompt

This commit is contained in:
PikaMug 2023-03-18 15:10:27 -04:00
parent 496e8eedce
commit 49392e5d1c
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/me/blackvein/quests/Quester.java
View File

@ -5127,8 +5127,6 @@ public class Quester implements IQuester {
if (q == null) {
continue;
}
// Share only same quest is not necessary here
// The function must be applied to the same quest
if ((q.getCurrentQuestsTemp().containsKey(quest) && currentStage.equals(q.getCurrentStage(quest)))) {
fun.apply(q);
}

21
core/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java
View File

@ -413,8 +413,8 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
}
stack.setItemMeta(meta);
}
context.setSessionData("tempStack", stack);
return oldPrompt;
}
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateNoNameAmount"));
@ -422,7 +422,7 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
}
default:
try {
return oldPrompt;
return new ItemStackPrompt(context, oldPrompt);
} catch (final Exception e) {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateCriticalError"));
return Prompt.END_OF_CONVERSATION;
@ -759,7 +759,7 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
}
}
private String getItemData(final ConversationContext context) {
public String getItemData(final ConversationContext context) {
if (context.getSessionData("tempName") != null) {
final StringBuilder item;
if (context.getSessionData("tempDisplay") == null) {
@ -784,35 +784,32 @@ public class ItemStackPrompt extends QuestsEditorNumericPrompt {
} else {
item.append(ChatColor.GRAY).append(" x ").append(ChatColor.DARK_AQUA).append("1");
}
item.append("\n");
if (context.getSessionData("tempEnchantments") != null) {
@SuppressWarnings("unchecked")
final
Map<Enchantment, Integer> enchantments
final Map<Enchantment, Integer> enchantments
= (Map<Enchantment, Integer>) context.getSessionData("tempEnchantments");
if (enchantments != null) {
for (final Entry<Enchantment, Integer> e : enchantments.entrySet()) {
item.append(ChatColor.GRAY).append(" - ").append(ChatColor.RED)
item.append("\n").append(ChatColor.GRAY).append(" - ").append(ChatColor.RED)
.append(ItemUtil.getPrettyEnchantmentName(e.getKey())).append(" ")
.append(RomanNumeral.getNumeral(e.getValue())).append("\n");
.append(RomanNumeral.getNumeral(e.getValue()));
}
}
}
if (context.getSessionData("tempLore") != null) {
@SuppressWarnings("unchecked")
final List<String> lore = (List<String>) context.getSessionData("tempLore");
item.append(ChatColor.DARK_GREEN).append("(Lore)\n\"");
item.append("\n").append(ChatColor.DARK_GREEN).append("(Lore)\"");
if (lore != null) {
for (final String s : lore) {
if (lore.indexOf(s) != (lore.size() - 1)) {
item.append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s).append("\n");
item.append("\n").append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s);
} else {
item.append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s).append("\"\n");
item.append("\n").append(ChatColor.DARK_GREEN).append(ChatColor.ITALIC).append(s).append("\"");
}
}
}
}
item.append("\n");
return item.toString();
} else {
return null;

2
core/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
View File

@ -695,7 +695,6 @@ public class PlayerListener implements Listener {
}
final IQuester quester = plugin.getQuester(damager.getUniqueId());
final ObjectiveType type = ObjectiveType.KILL_MOB;
final Set<String> dispatchedQuestIDs = new HashSet<>();
for (final IQuest quest : plugin.getLoadedQuests()) {
if (!quester.meetsCondition(quest, true)) {
continue;
@ -792,7 +791,6 @@ public class PlayerListener implements Listener {
}
final IQuester quester = plugin.getQuester(damager.getUniqueId());
final ObjectiveType type = ObjectiveType.KILL_PLAYER;
final Set<String> dispatchedQuestIDs = new HashSet<>();
for (final IQuest quest : plugin.getLoadedQuests()) {
if (!quester.meetsCondition(quest, true)) {
continue;