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

Fix gacha avatars (fixes #1870)

Browse Source
This commit is contained in:
AnimeGitB
2022-10-18 15:11:10 +10:30
parent 85f44ebdf3
commit aacf013c06
5 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseGainAvatar.java
View File

@@ -1,5 +1,7 @@
package emu.grasscutter.game.props.ItemUseAction;
import java.util.Optional;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.props.ItemUseOp;
import emu.grasscutter.game.systems.InventorySystem;
@@ -36,7 +38,10 @@ public class ItemUseGainAvatar extends ItemUseInt {
params.player.addAvatar(avatar);
return true;
} else {
int itemId = (this.i % 1000) + 100;
int itemId = Optional.ofNullable(params.player.getAvatars().getAvatarById(this.i))
.map(Avatar::getSkillDepot)
.map(depot -> depot.getTalentCostItemId())
.orElse((this.i % 1000) + 100);
return params.player.getInventory().addItem(itemId);
}
}