Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 08:56:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE on CookingCompoundManager init

Browse Source
This commit is contained in:
AnimeGitB
2022-10-18 19:19:08 +10:30
parent 2b08738043
commit 577772831c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java
View File

@@ -34,18 +34,16 @@ public class CookingCompoundManager extends BasePlayerManager {
public static void initialize() { public static void initialize() {
defaultUnlockedCompounds = new HashSet<>(); defaultUnlockedCompounds = new HashSet<>();
compoundGroups = new HashMap<>(); compoundGroups = new HashMap<>();
for (var compound : GameData.getCompoundDataMap().values()) { GameData.getCompoundDataMap().forEach((id, compound) -> {
if (compound.isDefaultUnlocked()) { if (compound.isDefaultUnlocked()) {
defaultUnlockedCompounds.add(compound.getId()); defaultUnlockedCompounds.add(id);
} }
if (!compoundGroups.containsKey(compound.getGroupId())) { compoundGroups.computeIfAbsent(compound.getGroupId(), gid -> new HashSet<>()).add(id);
compoundGroups.put(compound.getGroupId(), new HashSet<>()); });
}
compoundGroups.get(compound.getGroupId()).add(compound.getId());
}
//TODO:Because we haven't implemented fishing feature,unlock all compounds related to fish.Besides,it should be bound to player rather than manager. //TODO:Because we haven't implemented fishing feature,unlock all compounds related to fish.Besides,it should be bound to player rather than manager.
unlocked = new HashSet<>(defaultUnlockedCompounds); unlocked = new HashSet<>(defaultUnlockedCompounds);
unlocked.addAll(compoundGroups.get(3)); if (compoundGroups.containsKey(3)) // Avoid NPE from Resources error
unlocked.addAll(compoundGroups.get(3));
} }
private synchronized List<CompoundQueueData> getCompoundQueueData() { private synchronized List<CompoundQueueData> getCompoundQueueData() {