Skip to content

Commit dae5765

Browse files
committed
fix: fix PR feedback
1 parent 93db449 commit dae5765

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

common/src/main/java/dev/ftb/mods/ftbquests/quest/QuestObject.java

+1-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
44
import dev.ftb.mods.ftblibrary.icon.Color4I;
5-
import dev.ftb.mods.ftbquests.FTBQuests;
65
import dev.ftb.mods.ftbquests.events.QuestProgressEventData;
76
import dev.ftb.mods.ftbquests.quest.theme.property.ThemeProperties;
87
import dev.ftb.mods.ftbquests.util.ProgressChange;
@@ -127,19 +126,12 @@ public Collection<? extends QuestObject> getChildren() {
127126
}
128127

129128
public boolean isCompletedRaw(TeamData data) {
130-
FTBQuests.LOGGER.info("is completed raw: checking {}", this);
131129
for (QuestObject child : getChildren()) {
132-
FTBQuests.LOGGER.info("- check child {}", child);
133-
if (!child.isOptionalForProgression()
134-
&& !data.isExcludedByOtherQuestline(child)
135-
&& !data.isCompleted(child)) {
136-
FTBQuests.LOGGER.info("- not completed!");
130+
if (!child.isOptionalForProgression() && !data.isExcludedByOtherQuestline(child) && !data.isCompleted(child)) {
137131
return false;
138132
}
139133
}
140134
return true;
141-
142-
// return getChildren().stream().noneMatch(child -> !child.isOptionalForProgression() && !data.isCompleted(child));
143135
}
144136

145137
public boolean isOptionalForProgression() {

common/src/main/java/dev/ftb/mods/ftbquests/quest/task/ItemTask.java

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public void writeData(CompoundTag nbt, HolderLookup.Provider provider) {
102102
@Override
103103
public void readData(CompoundTag nbt, HolderLookup.Provider provider) {
104104
super.readData(nbt, provider);
105-
// TODO: FIXME: Something here is causing items to not be read correctly
106105
itemStack = itemOrMissingFromNBT(nbt.get("item"), provider);
107106
count = Math.max(nbt.getLong("count"), 1L);
108107
consumeItems = Tristate.read(nbt, "consume_items");

0 commit comments

Comments
 (0)