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

Internally take quest exclusively with ID

This commit is contained in:
PikaMug 2020-11-23 00:55:05 -05:00
parent d655d99ce9
commit 5f40c4de3b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -254,7 +254,7 @@ public class Quester implements Comparable<Quester> {
return questIdToTake;
}
public void setQuestToTake(final String questIdToTake) {
public void setQuestIdToTake(final String questIdToTake) {
this.questIdToTake = questIdToTake;
}
@ -3699,7 +3699,7 @@ public class Quester implements Comparable<Quester> {
if (canAcceptOffer(quest, giveReason)) {
if (getPlayer() instanceof Conversable) {
if (getPlayer().isConversing() == false) {
setQuestToTake(quest.getName());
setQuestIdToTake(quest.getId());
final String s = ChatColor.GOLD + "- " + ChatColor.DARK_PURPLE + quest.getName() + ChatColor.GOLD
+ " -\n" + "\n" + ChatColor.RESET + quest.getDescription() + "\n";
for (final String msg : s.split("<br>")) {

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

@ -99,7 +99,7 @@ public class NpcOfferQuestPrompt extends StringPrompt {
} else {
final Player player = quester.getPlayer();
if (quester.canAcceptOffer(q, true)) {
quester.setQuestToTake(q.getName());
quester.setQuestIdToTake(q.getId());
for (final String msg : extracted(plugin, quester).split("<br>")) {
player.sendMessage(msg);
}

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

@ -228,7 +228,7 @@ public class NpcListener implements Listener {
if (npcQuests.isEmpty() == false && npcQuests.size() == 1) {
final Quest q = npcQuests.get(0);
if (quester.canAcceptOffer(q, true)) {
quester.setQuestToTake(q.getName());
quester.setQuestIdToTake(q.getId());
if (!plugin.getSettings().canAskConfirmation()) {
quester.takeQuest(q, false);
} else {

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

@ -336,7 +336,7 @@ public class PlayerListener implements Listener {
return;
}
}
quester.setQuestToTake(q.getName());
quester.setQuestIdToTake(q.getId());
if (!plugin.getSettings().canAskConfirmation()) {
quester.takeQuest(q, false);
} else {