From 61fc07f58d76c83bbe968c959ddb1e854bfba0b4 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 2 Nov 2022 13:52:23 +0100 Subject: [PATCH] Removes the quests changed check as it was unreliable --- .../quests/QuestStagesInfoGenerator.java | 2 +- .../handler/trait/quests/QuestsHandler.java | 25 ++++++------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java index dbea1c1..5dd8618 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java @@ -42,7 +42,7 @@ public class QuestStagesInfoGenerator { int mobTypes = stage.getMobsToKill().size(); for (int i = 0; i < mobTypes; i++) { questInfo.append("
  • Kill ").append(QuestsHelper.normalizeName(stage.getMobsToKill().get(i).name())).append( - " X ").append(stage.getMobNumToKill().get(i)).append("
  • "); + " x ").append(stage.getMobNumToKill().get(i)).append(""); } int deliveries = stage.getItemDeliveryTargets().size(); for (int i = 0; i < deliveries; i++) { diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java index 1f570e6..61ff58b 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java @@ -18,7 +18,6 @@ import org.dynmap.markers.GenericMarker; import org.dynmap.markers.MarkerIcon; import org.dynmap.markers.MarkerSet; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -35,7 +34,6 @@ public class QuestsHandler extends AbstractTraitHandler { private MarkerSet questMarkerSet; private MarkerSet questAreaMarkerSet; private Map markerIcons; - private Collection loadedQuests; private Map questGiverInfo; @Override @@ -64,24 +62,17 @@ public class QuestsHandler extends AbstractTraitHandler { return; } - //There is no point in updating if there has been no changes in quests - boolean questsChanged = loadedQuests == null || !loadedQuests.equals(questsAPI.getLoadedQuests()); - loadedQuests = questsAPI.getLoadedQuests(); + //Remove old quest markers + questMarkerSet.getMarkers().forEach(GenericMarker::deleteMarker); - //Updates all quest area markers - if (questsChanged) { - //Remove old quest markers - questMarkerSet.getMarkers().forEach(GenericMarker::deleteMarker); - - //Update all area markers for quests - updateQuestAreas(); + //Update all area markers for quests + updateQuestAreas(); - //Generate information about all NPCs involved in quests - generateQuestNPCInfo(); + //Generate information about all NPCs involved in quests + generateQuestNPCInfo(); - //Generate markers based on the generated info - generateAllMarkers(); - } + //Generate markers based on the generated info + generateAllMarkers(); } /**