Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-18 05:21:20 +01:00
Code Issues Projects Releases Wiki Activity

Adjust kill NPC objective to progress to next stage, fixes #1647

Browse Source
This commit is contained in:
PikaMug 2021-03-16 23:47:08 -04:00
parent f7f8ebdab0
commit 857b580278
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1228,7 +1228,7 @@ public class Quester implements Comparable<Quester> {
if (data.citizenNumKilled.size() > data.citizensKilled.indexOf(n2) if (data.citizenNumKilled.size() > data.citizensKilled.indexOf(n2)
&& stage.citizenNumToKill.size() > stage.citizensToKill.indexOf(n)) { && stage.citizenNumToKill.size() > stage.citizensToKill.indexOf(n)) {
final ChatColor color = data.citizenNumKilled.get(data.citizensKilled.indexOf(n2)) final ChatColor color = data.citizenNumKilled.get(data.citizensKilled.indexOf(n2))
< stage.citizenNumToKill.get(stage.citizensToKill.indexOf(n)) == false < stage.citizenNumToKill.get(stage.citizensToKill.indexOf(n))
? ChatColor.GREEN : ChatColor.GRAY; ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + Lang.get(getPlayer(), "kill"); String message = color + Lang.get(getPlayer(), "kill");
if (message.contains("<mob>")) { if (message.contains("<mob>")) {

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

@ -1297,7 +1297,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
if (data.citizenNumKilled.size() > data.citizensKilled.indexOf(n2) if (data.citizenNumKilled.size() > data.citizensKilled.indexOf(n2)
&& stage.citizenNumToKill.size() > stage.citizensToKill.indexOf(n)) { && stage.citizenNumToKill.size() > stage.citizensToKill.indexOf(n)) {
final ChatColor color = data.citizenNumKilled.get(data.citizensKilled.indexOf(n2)) final ChatColor color = data.citizenNumKilled.get(data.citizensKilled.indexOf(n2))
< stage.citizenNumToKill.get(stage.citizensToKill.indexOf(n)) == false < stage.citizenNumToKill.get(stage.citizensToKill.indexOf(n))
? ChatColor.GREEN : ChatColor.GRAY; ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + "- " + Lang.get(quester.getPlayer(), "kill"); String message = color + "- " + Lang.get(quester.getPlayer(), "kill");
if (message.contains("<mob>")) { if (message.contains("<mob>")) {
@ -1378,7 +1378,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
for (final String s : stage.passwordDisplays) { for (final String s : stage.passwordDisplays) {
if (data.passwordsSaid.containsKey(s)) { if (data.passwordsSaid.containsKey(s)) {
final Boolean b = data.passwordsSaid.get(s); final Boolean b = data.passwordsSaid.get(s);
final ChatColor color = b != null && !b == false ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = b != null && b == false ? ChatColor.GREEN : ChatColor.GRAY;
final String message = color + "- " + s; final String message = color + "- " + s;
quester.sendMessage(message); quester.sendMessage(message);
} }