From a078973df21f019f81d0f22d8579663a4751d03a Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Thu, 23 Sep 2021 23:22:12 -0400
Subject: [PATCH] Always continue kill objective checks

---
 .../quests/listeners/PlayerListener.java      | 12 +++++++----
 .../implementation/sql/SqlStorage.java        | 21 +++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
index f8ca10b87..70b332dd9 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -677,9 +677,11 @@ public class PlayerListener implements Listener {
                 if (!quester.meetsCondition(quest, true)) {
                     continue;
                 }
+                if (!quester.getCurrentQuests().containsKey(quest)) {
+                    continue;
+                }
                 
-                if (quester.getCurrentQuests().containsKey(quest) 
-                        && quester.getCurrentStage(quest).containsObjective(type)) {
+                if (quester.getCurrentStage(quest).containsObjective(type)) {
                     quester.killMob(quest, target.getLocation(), target.getType());
                 }
                 
@@ -779,9 +781,11 @@ public class PlayerListener implements Listener {
                 if (!quester.meetsCondition(quest, true)) {
                     continue;
                 }
+                if (!quester.getCurrentQuests().containsKey(quest)) {
+                    continue;
+                }
                 
-                if (quester.getCurrentQuests().containsKey(quest) 
-                        && quester.getCurrentStage(quest).containsObjective(type)) {
+                if (quester.getCurrentStage(quest).containsObjective(type)) {
                     quester.killPlayer(quest, (Player)target);
                 }
                 
diff --git a/main/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java b/main/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java
index 87bafcacd..22a48f053 100644
--- a/main/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java
+++ b/main/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java
@@ -425,7 +425,7 @@ public class SqlStorage implements StorageImplementation {
     }
     
     public ConcurrentHashMap<Quest, Integer> getQuesterCurrentQuests(final UUID uniqueId) throws Exception {
-        final ConcurrentHashMap<Quest, Integer> currentQuests = new ConcurrentHashMap<Quest, Integer>();
+        final ConcurrentHashMap<Quest, Integer> currentQuests = new ConcurrentHashMap<>();
         try (Connection c = connectionFactory.getConnection()) {
             try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_CURRENT_QUESTS_SELECT_BY_UUID))) {
                 ps.setString(1, uniqueId.toString());
@@ -442,10 +442,9 @@ public class SqlStorage implements StorageImplementation {
         return currentQuests;
     }
 
-    @SuppressWarnings("unchecked")
     public ConcurrentHashMap<Quest, QuestData> getQuesterQuestData(final UUID uniqueId) throws Exception {
         final Quester quester = plugin.getQuester(uniqueId);
-        final ConcurrentHashMap<Quest, QuestData> questData = new ConcurrentHashMap<Quest, QuestData>();
+        final ConcurrentHashMap<Quest, QuestData> questData = new ConcurrentHashMap<>();
         try (Connection c = connectionFactory.getConnection()) {
             try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_QUEST_DATA_SELECT_BY_UUID))) {
                 ps.setString(1, uniqueId.toString());
@@ -499,7 +498,7 @@ public class SqlStorage implements StorageImplementation {
     }
     
     public ConcurrentSkipListSet<Quest> getQuesterCompletedQuests(final UUID uniqueId) throws Exception {
-        final ConcurrentSkipListSet<Quest> completedQuests = new ConcurrentSkipListSet<Quest>();
+        final ConcurrentSkipListSet<Quest> completedQuests = new ConcurrentSkipListSet<>();
         try (Connection c = connectionFactory.getConnection()) {
             try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_COMPLETED_QUESTS_SELECT_BY_UUID))) {
                 ps.setString(1, uniqueId.toString());
@@ -517,7 +516,7 @@ public class SqlStorage implements StorageImplementation {
     }
     
     public ConcurrentHashMap<Quest, Long> getQuesterCompletedTimes(final UUID uniqueId) throws Exception {
-        final ConcurrentHashMap<Quest, Long> completedTimes = new ConcurrentHashMap<Quest, Long>();
+        final ConcurrentHashMap<Quest, Long> completedTimes = new ConcurrentHashMap<>();
         try (Connection c = connectionFactory.getConnection()) {
             try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_REDOABLE_QUESTS_SELECT_BY_UUID))) {
                 ps.setString(1, uniqueId.toString());
@@ -535,7 +534,7 @@ public class SqlStorage implements StorageImplementation {
     }
     
     public ConcurrentHashMap<Quest, Integer> getQuesterAmountsCompleted(final UUID uniqueId) throws Exception {
-        final ConcurrentHashMap<Quest, Integer> amountsCompleted = new ConcurrentHashMap<Quest, Integer>();
+        final ConcurrentHashMap<Quest, Integer> amountsCompleted = new ConcurrentHashMap<>();
         try (Connection c = connectionFactory.getConnection()) {
             try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_REDOABLE_QUESTS_SELECT_BY_UUID))) {
                 ps.setString(1, uniqueId.toString());
@@ -554,12 +553,12 @@ public class SqlStorage implements StorageImplementation {
 
     @Override
     public Collection<UUID> getSavedUniqueIds() throws Exception {
-        final Collection<UUID> ids = new ConcurrentSkipListSet<UUID>();
+        final Collection<UUID> ids = new ConcurrentSkipListSet<>();
         try (Connection c = connectionFactory.getConnection()) {
             try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_SELECT_UUID))) {
                 try (ResultSet rs = ps.executeQuery()) {
                     while (rs.next()) {
-                        UUID id = null;
+                        UUID id;
                         try {
                             id = UUID.fromString(rs.getString("uuid"));
                         } catch (final IllegalArgumentException e) {
@@ -584,7 +583,7 @@ public class SqlStorage implements StorageImplementation {
     }
 
     public LinkedList<Integer> deserializeIntProgress(String string) {
-        LinkedList<Integer> list = new LinkedList<Integer>();
+        LinkedList<Integer> list = new LinkedList<>();
         if (string != null) {
             string = string.replace("{", "").replace("}", "");
             for (String section : string.split(",")) {
@@ -595,7 +594,7 @@ public class SqlStorage implements StorageImplementation {
     }
 
     public LinkedList<Boolean> deserializeBooleanProgress(String string) {
-        LinkedList<Boolean> list = new LinkedList<Boolean>();
+        LinkedList<Boolean> list = new LinkedList<>();
         if (string != null) {
             string = string.replace("{", "").replace("}", "");
             for (String section : string.split(",")) {
@@ -616,7 +615,7 @@ public class SqlStorage implements StorageImplementation {
     }
 
     public LinkedList<ItemStack> deserializeItemStackProgress(String string, LinkedList<ItemStack> objective) {
-        LinkedList<ItemStack> list = new LinkedList<ItemStack>();
+        LinkedList<ItemStack> list = new LinkedList<>();
         if (string != null) {
             string = string.replace("{", "").replace("}", "");
             int index = 0;