diff --git a/src/main/java/emu/grasscutter/game/props/ElementType.java b/src/main/java/emu/grasscutter/game/props/ElementType.java index 7da00a418..db8887d71 100644 --- a/src/main/java/emu/grasscutter/game/props/ElementType.java +++ b/src/main/java/emu/grasscutter/game/props/ElementType.java @@ -26,7 +26,7 @@ public enum ElementType { @Getter private final int teamResonanceId; @Getter private final FightProperty curEnergyProp; @Getter private final FightProperty maxEnergyProp; - @Getter private int depotValue; + @Getter private final int depotValue; @Getter private final int configHash; private static final Int2ObjectMap map = new Int2ObjectOpenHashMap<>(); private static final Map stringMap = new HashMap<>(); @@ -39,14 +39,19 @@ public enum ElementType { } private ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp) { - this(value, curEnergyProp, maxEnergyProp, 0, null); + this(value, curEnergyProp, maxEnergyProp, 0, null, 1); } private ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp, int teamResonanceId, String configName) { + this(value, curEnergyProp, maxEnergyProp, teamResonanceId, configName, 1); + } + + private ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp, int teamResonanceId, String configName, int depotValue) { this.value = value; this.curEnergyProp = curEnergyProp; this.maxEnergyProp = maxEnergyProp; this.teamResonanceId = teamResonanceId; + this.depotValue = depotValue; if (configName != null) { this.configHash = Utils.abilityHash(configName); } else { @@ -54,11 +59,6 @@ public enum ElementType { } } - private ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp, int teamResonanceId, String configName, int depotValue) { - this(value, curEnergyProp, maxEnergyProp, teamResonanceId, configName); - this.depotValue = depotValue; - } - public static ElementType getTypeByValue(int value) { return map.getOrDefault(value, None); }