From 0f43e18d707806be53910903da68b2e4e380e7d2 Mon Sep 17 00:00:00 2001
From: StartForKiller <jesussanz2003@gmail.com>
Date: Tue, 6 Jun 2023 18:07:40 -0400
Subject: [PATCH] Fix some affixes not working

---
 .../java/emu/grasscutter/game/entity/EntityMonster.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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;