Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-23 11:05:38 +01:00
Code Issues Projects Releases Wiki Activity

Ignore cooldown after repeat cycle, part 4. Fixes #1244

Browse Source
This commit is contained in:
PikaMug 2020-07-30 18:09:34 -04:00
parent e2b8924c22
commit 2e17852081
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/me/blackvein/quests/convo/npcs/NpcOfferQuestPrompt.java
View File

@ -101,8 +101,7 @@ public class NpcOfferQuestPrompt extends StringPrompt {
Player player = quester.getPlayer(); Player player = quester.getPlayer();
if (quester.canAcceptOffer(q, true)) { if (quester.canAcceptOffer(q, true)) {
quester.setQuestToTake(q.getName()); quester.setQuestToTake(q.getName());
String s = extracted(plugin, quester); for (String msg : extracted(plugin, quester).split("<br>")) {
for (String msg : s.split("<br>")) {
player.sendMessage(msg); player.sendMessage(msg);
} }
if (!plugin.getSettings().canAskConfirmation()) { if (!plugin.getSettings().canAskConfirmation()) {

34
main/src/main/java/me/blackvein/quests/listeners/NpcListener.java
View File

@ -37,7 +37,6 @@ import me.blackvein.quests.Quester;
import me.blackvein.quests.Quests; import me.blackvein.quests.Quests;
import me.blackvein.quests.util.ItemUtil; import me.blackvein.quests.util.ItemUtil;
import me.blackvein.quests.util.Lang; import me.blackvein.quests.util.Lang;
import me.blackvein.quests.util.MiscUtil;
import me.blackvein.quests.util.RomanNumeral; import me.blackvein.quests.util.RomanNumeral;
import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.event.NPCDeathEvent; import net.citizensnpcs.api.event.NPCDeathEvent;
@ -230,7 +229,36 @@ public class NpcListener implements Listener {
} }
if (npcQuests.isEmpty() == false && npcQuests.size() == 1) { if (npcQuests.isEmpty() == false && npcQuests.size() == 1) {
Quest q = npcQuests.get(0); Quest q = npcQuests.get(0);
if (!quester.getCompletedQuests().contains(q.getName())) { if (quester.canAcceptOffer(q, true)) {
quester.setQuestToTake(q.getName());
if (!plugin.getSettings().canAskConfirmation()) {
quester.takeQuest(q, false);
} else {
if (q.getGUIDisplay() != null) {
quester.showGUIDisplay(evt.getNPC(), npcQuests);
} else {
for (String msg : extracted(quester).split("<br>")) {
player.sendMessage(msg);
}
plugin.getConversationFactory().buildConversation((Conversable) player).begin();
}
}
}
} else if (npcQuests.isEmpty() == false && npcQuests.size() > 1) {
if (hasAtLeastOneGUI) {
quester.showGUIDisplay(evt.getNPC(), npcQuests);
} else {
Conversation c = plugin.getNpcConversationFactory().buildConversation(player);
c.getContext().setSessionData("npcQuests", npcQuests);
c.getContext().setSessionData("npc", evt.getNPC().getName());
c.begin();
}
return;
} else if (npcQuests.isEmpty()) {
evt.getClicker().sendMessage(ChatColor.YELLOW + Lang.get(player, "noMoreQuest"));
}
/*if (!quester.getCompletedQuests().contains(q.getName())) {
if (quester.getCurrentQuests().size() < plugin.getSettings().getMaxQuests() if (quester.getCurrentQuests().size() < plugin.getSettings().getMaxQuests()
|| plugin.getSettings().getMaxQuests() < 1) { || plugin.getSettings().getMaxQuests() < 1) {
quester.setQuestToTake(q.getName()); quester.setQuestToTake(q.getName());
@ -296,7 +324,7 @@ public class NpcListener implements Listener {
return; return;
} else if (npcQuests.isEmpty()) { } else if (npcQuests.isEmpty()) {
evt.getClicker().sendMessage(ChatColor.YELLOW + Lang.get(player, "noMoreQuest")); evt.getClicker().sendMessage(ChatColor.YELLOW + Lang.get(player, "noMoreQuest"));
} }*/
} }
} }
} }