diff --git a/src/main/java/emu/grasscutter/game/entity/EntityMonster.java b/src/main/java/emu/grasscutter/game/entity/EntityMonster.java index 75f76be6d..2692676f7 100644 --- a/src/main/java/emu/grasscutter/game/entity/EntityMonster.java +++ b/src/main/java/emu/grasscutter/game/entity/EntityMonster.java @@ -113,7 +113,12 @@ public class EntityMonster extends GameEntity { if(monster != null) affixes = monster.affix; } - if (affixes != null) { + if (monsterData != null) { + if (affixes == null) affixes = monsterData.getAffix(); + else affixes.addAll(monsterData.getAffix()); + } + + if(affixes != null) { for(var affixId : affixes) { var affix = GameData.getMonsterAffixDataMap().get(affixId.intValue()); if (!affix.isPreAdd()) continue;