From 142fbe51e2cdacfa76ff10261e3598662d0afe9d Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Thu, 11 May 2023 20:27:00 -0500 Subject: [PATCH] Fixed quest not tracking from previous commit. --- .../noppes/npcs/controllers/data/PlayerQuestData.java | 2 +- src/main/java/noppes/npcs/quests/QuestItem.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java index 7fc9ae1f6..1ee181c3b 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java @@ -146,7 +146,7 @@ public class PlayerQuestData implements IPlayerQuestData { } public void trackQuest(IQuest quest) { - if (quest.getId() != this.trackedQuest.getId()) { + if (this.trackedQuest == null || quest.getId() != this.trackedQuest.getId()) { this.trackedQuest = quest; NoppesUtilPlayer.sendTrackedQuestData((EntityPlayerMP) this.parent.player, (Quest) this.trackedQuest); } diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index 8aa442b68..be42bf9da 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -131,18 +131,16 @@ public class QuestItem extends QuestInterface implements IQuestItem { } public IQuestObjective[] getObjectives(EntityPlayer player) { - List list = new ArrayList(); + List list = new ArrayList<>(); List questItems = NoppesUtilPlayer.countStacks(this.items, this.ignoreDamage, this.ignoreNBT); - Iterator var4 = questItems.iterator(); - while(var4.hasNext()) { - ItemStack stack = (ItemStack)var4.next(); + for (ItemStack stack : questItems) { if (stack.stackSize > 0) { - list.add(new noppes.npcs.quests.QuestItem.QuestItemObjective(this, player, stack)); + list.add(new QuestItemObjective(this, player, stack)); } } - return (IQuestObjective[])list.toArray(new IQuestObjective[list.size()]); + return list.toArray(new IQuestObjective[0]); } public void setLeaveItems(boolean leaveItems){