Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-26 18:45:35 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests

Browse Source
This commit is contained in:
KingRainbow44 2023-04-13 15:47:32 -04:00
commit 349f76b7d8
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/grasscutter/game/entity/EntityMonster.java
View File

@ -238,8 +238,10 @@ public class EntityMonster extends GameEntity {
.setPoseId(this.getPoseId()) .setPoseId(this.getPoseId())
.setBlockId(getScene().getId()) .setBlockId(getScene().getId())
.setBornType(MonsterBornType.MONSTER_BORN_TYPE_DEFAULT); .setBornType(MonsterBornType.MONSTER_BORN_TYPE_DEFAULT);
if (metaMonster.special_name_id != 0) {
if (getMonsterData().getDescribeData() != null) { monsterInfo.setTitleId(metaMonster.title_id)
.setSpecialNameId(metaMonster.special_name_id);
} else if (getMonsterData().getDescribeData() != null) {
monsterInfo.setTitleId(getMonsterData().getDescribeData().getTitleId()) monsterInfo.setTitleId(getMonsterData().getDescribeData().getTitleId())
.setSpecialNameId(getMonsterData().getSpecialNameId()); .setSpecialNameId(getMonsterData().getSpecialNameId());