From 0fc578a243300d80821cd238010008646eb1386d Mon Sep 17 00:00:00 2001 From: Thoronium <107363768+NotThorny@users.noreply.github.com> Date: Thu, 2 Feb 2023 06:48:42 -0700 Subject: [PATCH] Fix Cooking Compound Retrieval (#2039) * Fix misnamed field * Fix getter name --- src/main/java/emu/grasscutter/data/excels/CompoundData.java | 2 +- .../game/managers/cooking/CookingCompoundManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/data/excels/CompoundData.java b/src/main/java/emu/grasscutter/data/excels/CompoundData.java index bca04177b..50f85ee7c 100644 --- a/src/main/java/emu/grasscutter/data/excels/CompoundData.java +++ b/src/main/java/emu/grasscutter/data/excels/CompoundData.java @@ -12,7 +12,7 @@ import java.util.List; public class CompoundData extends GameResource { @Getter(onMethod = @__(@Override)) private int id; - private int groupId; + private int groupID; private int rankLevel; private boolean isDefaultUnlocked; private int costTime; diff --git a/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java b/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java index ad1f5b419..245a530c6 100644 --- a/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java +++ b/src/main/java/emu/grasscutter/game/managers/cooking/CookingCompoundManager.java @@ -38,7 +38,7 @@ public class CookingCompoundManager extends BasePlayerManager { if (compound.isDefaultUnlocked()) { defaultUnlockedCompounds.add(id); } - compoundGroups.computeIfAbsent(compound.getGroupId(), gid -> new HashSet<>()).add(id); + compoundGroups.computeIfAbsent(compound.getGroupID(), gid -> new HashSet<>()).add(id); }); //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);