From 857b58027803d140d5817ac147b2059955ee2142 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Tue, 16 Mar 2021 23:47:08 -0400 Subject: [PATCH] Adjust kill NPC objective to progress to next stage, fixes #1647 --- main/src/main/java/me/blackvein/quests/Quester.java | 2 +- main/src/main/java/me/blackvein/quests/Quests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index a51246f6c..c4e15f619 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -1228,7 +1228,7 @@ public class Quester implements Comparable { if (data.citizenNumKilled.size() > data.citizensKilled.indexOf(n2) && stage.citizenNumToKill.size() > stage.citizensToKill.indexOf(n)) { 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; String message = color + Lang.get(getPlayer(), "kill"); if (message.contains("")) { diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java index ef41a26f0..68117852a 100644 --- a/main/src/main/java/me/blackvein/quests/Quests.java +++ b/main/src/main/java/me/blackvein/quests/Quests.java @@ -1297,7 +1297,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener if (data.citizenNumKilled.size() > data.citizensKilled.indexOf(n2) && stage.citizenNumToKill.size() > stage.citizensToKill.indexOf(n)) { 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; String message = color + "- " + Lang.get(quester.getPlayer(), "kill"); if (message.contains("")) { @@ -1378,7 +1378,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener for (final String s : stage.passwordDisplays) { if (data.passwordsSaid.containsKey(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; quester.sendMessage(message); }