Merge unstable into development (#2173)

* Remove more scene synchronized * Fix worktop options not appearing * Format code [skip actions] * Fix delay with server tasks * Format code [skip actions] * Fully fix fairy clock (#2146) * Fix scene transition * fully fix fairy clock * Re-add call to `Player#updatePlayerGameTime` * Format code [skip actions] * Initialize the script loader in `ResourceLoader#loadAll` * Fix region removal checking * Format code [skip actions] * Use Lombok's `EqualsAndHashCode` for comparing scene regions * Format code [skip actions] * Move 'invalid gather object' to `trace` * Add more information to the 'unknown condition handler' message * Move invalid ability action to trace * Make `KcpTunnel` public * Validate the NPC being talked to * Format code [skip actions] * NPCs are not spawned server side; change logic to handle it * Format code [skip actions] * unload scene when there are no players (#2147) * unload scene when there are no players * Update src/main/java/emu/grasscutter/game/world/Scene.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Check if a command should be copied or HTTP should be used * Lint Code [skip actions] * Fix character names rendering incorrectly * Add basic troubleshooting command * Implement handbook teleporting also a few formatting changes and sort data by logical sense * Fix listener `ConcurrentModificationException` issue * Add color change to `Join the Community!` * Lint Code [skip actions] * Make clickable buttons appear clickable * Remove 'Mechanicus' entities from the list of entities * Format code [skip actions] * Fix going back returning a blank screen * Implement entity spawning * Add setting level to entity card * Add support for 'plain text' mode * Make descriptions of objects scrollable * Lint Code [skip actions] * Format code [skip actions] * Change the way existing hooks work * Format code [skip actions] * Upgrade Javalin to 5.5.0 & Fix project warnings * Upgrade logging libraries * Fix gacha mappings static file issue * Add temporary backwards compatability for `ServerHelper` * Format code [skip actions] * Remove artifact signatures from VCS * Fix forge queue data protocol definition * Run `spotlessApply` * Format code [skip actions] * Download data required for building artifacts * Add call for Facebook logins * Add the wiki page as a submodule * Format code [skip actions] * Update translation (#2150) * Update translation * Update translation * Separate the dispatch and game servers (pt. 1) gacha is still broken, handbook still needs to be done * Format code [skip actions] * Separate the dispatch and game servers (pt. 2) this commit fixes the gacha page * Add description for '/troubleshoot' * Set default avatar talent level to 10 * Separate the dispatch and game servers (pt. 3) implement handbook across servers! * Format code [skip actions] * Update GitHub Actions to use 'download-file' over 'wget' * Gm handbook lmao (#2149) * Fix font issue * Fix avatars * Fix text overflow in commands * Fix virtualized lists and items page 😭😭 * magix why 💀 * use hover style in all minicards * button * remove console.log * lint * Add icons * magix asked * Fix overflow padding issue * Fix achievement text overflow * remove icons from repo * Change command icon * Add the wiki page as a submodule * total magix moment * fix text overflow in commands * Fix discord button * Make text scale on Minicard * import icons and font from another source * Add hover effects to siebar buttons * move font and readme to submodule repo * Make data folder a submodule * import icons and font from data submodule * Update README.md * total magix moment * magix moment v2 * submodule change * Import `.webp` files * Resize `HomeButton` * Fix 'Copy Command' reappearing after changing pages --------- Co-authored-by: KingRainbow44 <kobedo11@gmail.com> * Lint Code [skip actions] * Download data for the build, not for the lint * format imports this is really just to see if build handbook works kek * Implement proper handbook authentication (pt. 1) * Implement proper handbook authentication (pt. 2) * Format code [skip actions] * Add quest data dumping for the handbook * Change colors to fit _something suitable_ * Format code [skip actions] * Fix force pushing to branches after linting * Fix logic of `SetPlayerPropReq` * Move more group loading to `trace` * Add handbook IP authentication in hybrid mode * Fix player level up not displaying on the client properly * Format code [skip actions] * Fix game time locking * Format code [skip actions] * Update player properties * Format code [skip actions] * Move `warn`s for groups to `debug` * Fix player pausing * Move more logs to `trace` * Use `removeItemById` for deleting items via quests * Clean up logger more * Pause in-game time when the world is paused * Format code [skip actions] * More player property documentation * Multi-threaded resource loading * Format code [skip actions] * Add quest widgets * Add quests page (basic impl.) * Add/fix colors also fix tailwind * Remove banned packets client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted * Re-add `BeginCameraSceneLookNotify` * Fix being unable to attack (#2157) * Add `PlayerOpenChestEvent` * Add methods to get players from the server * Add static methods to register an event handler * Add `PlayerEnterDungeonEvent` * Remove legacy documentation from `PlayerMoveEvent` * Add `PlayerChatEvent` * Add defaults to `Position` * Clean up `.utils` * Revert `Multi-threaded resource loading` * Fix changing target UID when talking to the server * Lint Code [skip actions] * Format code [skip actions] * fix NPC talk triggering main quest in 46101 (#2158) Make it so that only talks where the param matches the talkId are checked. * Format code [skip actions] * Partially fix Chasing Shadows (#2159) * Partially fix Chasing Shadows * Go ahead and move it before the return before Magix tells me to. * Format code [skip actions] * Bring back period lol (#2160) * Disable SNI for the HTTPS server * Add `EntityCreationEvent` * Add initial startup message this is so the server appears like its preparing to start * Format code [skip actions] * Enable debug mode for plugin loggers if enabled for the primary logger * Add documentation about `WorldAreaConfigData` * Make more fields in excels accessible * Remove deprecated fields from `GetShopRsp` * Run `spotlessApply` on definitions * Add `PlayerEnterAreaEvent` * Optimize event calls * Fix event invokes * Format code [skip actions] * Remove manual autofinish for main quests. (#2162) * Add world areas to the textmap cache * Format code [skip actions] * Don't overdefine variables in extended classes (#2163) * Add dumper for world areas * Format code [skip actions] * instantiate personalLineList (#2165) * Fix protocol definitions thank you Nazrin! (+ hiro for raw definitions) * Fix the background color leaking from the character widget * Change HTML spacing to 2 spaces * Implement hiding widgets * Change scrollbar to a vibrant color * Add _some_ scaling to the home buttons and its text * Build the handbook with Gradle * Fix the 'finer details' with the handbook UI * Lint Code [skip actions] * Fix target destination for the Gradle-built handbook * Implement fetching a player across servers & Add a chainable JsonObject useful for plugins! might be used in grasscutter eventually * Fix GitHub actions * Fix event calling & canceling * Run `spotlessApply` * Rename fields (might be wrong) * Add/update all/more protocol definitions * Add/update all/more protocol definitions * Remove outdated packet * Fix protocol definitions * Format code [skip actions] * Implement some lua variables for less console spam (#2172) * Implement some lua variables for less console spam * Add GetHostQuestState This fixes some chapter 3 stuff. * Format code [skip actions] * Fix merge import * Format code [skip actions] * Fully fix fairy clock for real this time (#2167) * Fully fix fairy clock For real this time * Make it so relogging keeps the time lock state. * Refactor out questLockTime * Per Hartie, the client packet needs to be changed too * Update src/main/java/emu/grasscutter/game/world/World.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java * Remove all code not needed to get clock working --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Implement a proper ability system (#2166) * Apply fix `21dec2fe` * Apply fix `89d01d5f` * Apply fix `d900f154` this one was already implemented; updated to use call from previous commit * Ability changing commit TODO: change info to debug * Remove use of deprecated methods/fields * Temp commit v2 (Adding LoseHP and some fixes) * Oopsie * Probably fix monster battle * Fix issue with reflecting into fields * Fix some things * Fix ability names for 3.6 resources * Improve logging --------- Co-authored-by: StartForKiller <jesussanz2003@gmail.com> * Format code [skip actions] * Add system for sending messages between servers * Format some code * Remove protocol definitions from Spotless * Default debug to false; enable with `-debug` * Implement completely useless global value copying * HACK: Return the avatar which holds the weapon when the weapon is referred to by ID * Add properties to `AbilityModifier` * Change the way HTML is served after authentication * Use thread executors to speed up the database loading process * Format code [skip actions] * Add system for setting handbook address and port * Lint Code [skip actions] * Format code [skip actions] * Fix game-related data not saving * Format code [skip actions] * Fix handbook server details * Lint Code [skip actions] * Format code [skip actions] * Use the headers provided by a context to get the IP address should acknowledge #1975 * Format code [skip actions] * Move more logs to `trace` * Format code [skip actions] * more trace * Fix something and implement weapon entities * Format code [skip actions] * Fix `EntityWeapon` * Remove deprecated API & Fix resource checking * Fix unnecessary warning for first-time setup * Implement handbook request limiting * Format code [skip actions] * Fix new avatar weapons being null * Format code [skip actions] * Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met * Load activity config on server startup * Require plugins to specify an API version and match with the server * Add default open state ignore list * Format code [skip actions] * Quick fix for questing, needs more investigation This would make the questing work again * Remove existing hack for 35303 * Fix ignored open states from being set * Format code [skip actions] * fix the stupidest bug ive ever seen * Optimize player kicking on server close * Format code [skip actions] * Re-add hack to fix 35303 * Update GitHub actions * Format code [skip actions] * Potentially fix issues with regions * Download additional handbook data * Revert "Potentially fix issues with regions" This reverts commit 84e3823695. --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: scooterboo <lewasite@yahoo.com> Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com> Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com> Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2026-05-20 08:40:02 +08:00 · 2023-05-31 20:48:16 -07:00
parent f46fd372d2
commit 9e5b57a043
3839 changed files with 1841548 additions and 37533 deletions
@@ -1,20 +1,19 @@
 package emu.grasscutter.game.entity;

-import java.util.Optional;
-
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.AbilityData;
+import emu.grasscutter.data.binout.config.ConfigEntityMonster;
 import emu.grasscutter.data.common.PropGrowCurve;
 import emu.grasscutter.data.excels.EnvAnimalGatherConfigData;
-import emu.grasscutter.data.excels.MonsterCurveData;
-import emu.grasscutter.data.excels.MonsterData;
+import emu.grasscutter.data.excels.monster.MonsterCurveData;
+import emu.grasscutter.data.excels.monster.MonsterData;
+import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.game.props.EntityIdType;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.game.props.*;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.game.world.Position;
 import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.data.excels.MonsterSpecialNameData;
+import emu.grasscutter.game.world.SceneGroupInstance;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
@@ -29,15 +28,22 @@ import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 import emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo;
 import emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo;
 import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.SceneMonster;
 import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.utils.Position;
-import emu.grasscutter.utils.ProtoHelper;
+import emu.grasscutter.server.event.entity.EntityDamageEvent;
+import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 import lombok.Getter;
 import lombok.Setter;

+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static emu.grasscutter.scripts.constants.EventType.EVENT_SPECIFIC_MONSTER_HP_CHANGE;
+
 public class EntityMonster extends GameEntity {
-    @Getter private final MonsterData monsterData;
    @Getter(onMethod_ = @Override)
    private final Int2FloatOpenHashMap fightProperties;

@@ -45,12 +51,17 @@ public class EntityMonster extends GameEntity {
    private final Position position;
    @Getter(onMethod_ = @Override)
    private final Position rotation;
+    @Getter private final MonsterData monsterData;
+    @Getter private final ConfigEntityMonster configEntityMonster;
    @Getter private final Position bornPos;
    @Getter private final int level;
-    private int weaponEntityId;
+    @Getter private EntityWeapon weaponEntity;
    @Getter @Setter private int poseId;
    @Getter @Setter private int aiId = -1;

+    @Getter private List<Player> playerOnBattle;
+    @Nullable @Getter @Setter private SceneMonster metaMonster;
+
    public EntityMonster(Scene scene, MonsterData monsterData, Position pos, int level) {
        super(scene);
        this.id = getWorld().getNextEntityId(EntityIdType.MONSTER);
@@ -60,13 +71,107 @@ public class EntityMonster extends GameEntity {
        this.rotation = new Position();
        this.bornPos = getPosition().clone();
        this.level = level;
+        this.playerOnBattle = new ArrayList<>();
+
+        if(GameData.getMonsterMappingMap().containsKey(getMonsterId())) {
+            this.configEntityMonster = GameData.getMonsterConfigData().get(GameData.getMonsterMappingMap().get(getMonsterId()).getMonsterJson());
+        } else {
+            this.configEntityMonster = null;
+        }

        // Monster weapon
        if (getMonsterWeaponId() > 0) {
-            this.weaponEntityId = getWorld().getNextEntityId(EntityIdType.WEAPON);
+            this.weaponEntity = new EntityWeapon(scene, getMonsterWeaponId());
+            scene.getWeaponEntities().put(this.weaponEntity.getId(), this.weaponEntity);
+            //this.weaponEntityId = getWorld().getNextEntityId(EntityIdType.WEAPON);
        }

        this.recalcStats();
+
+        initAbilities();
+    }
+
+    private void addConfigAbility(String name){
+        AbilityData data =  GameData.getAbilityData(name);
+        if(data != null)
+            getScene().getWorld().getHost().getAbilityManager().addAbilityToEntity(
+                this, data);
+    }
+
+    @Override
+    public void initAbilities() {
+        if(configEntityMonster != null) {
+            // Affix abilities
+            var optionalGroup = getScene().getLoadedGroups().stream()
+                .filter(g -> g.id == this.getGroupId())
+                .findAny();
+            List<Integer> affixes = null;
+            if (optionalGroup.isPresent()) {
+                var group = optionalGroup.get();
+
+                SceneMonster monster = group.monsters.get(getConfigId());
+                if(monster != null) affixes = monster.affix;
+            }
+
+            if (affixes != null) {
+                for(var affixId : affixes) {
+                    var affix = GameData.getMonsterAffixDataMap().get(affixId.intValue());
+                    if (!affix.isPreAdd()) continue;
+
+                    //Add the ability
+                    for(var name : affix.getAbilityName()) {
+                        this.addConfigAbility(name);
+                    }
+                }
+            }
+
+            //TODO: Research if any monster is non humanoid
+            for(var ability : GameData.getConfigGlobalCombat().getDefaultAbilities().getNonHumanoidMoveAbilities()) {
+                this.addConfigAbility(ability);
+            }
+
+            if (configEntityMonster.getAbilities() != null)
+                for (var configAbilityData : configEntityMonster.getAbilities()) {
+                    this.addConfigAbility(configAbilityData.abilityName);
+                }
+
+            if (optionalGroup.isPresent()) {
+                var group = optionalGroup.get();
+                SceneMonster monster = group.monsters.get(getConfigId());
+                if(monster != null && monster.isElite) {
+                    addConfigAbility(GameData.getConfigGlobalCombat().getDefaultAbilities().getMonterEliteAbilityName());
+                }
+            }
+
+            if (affixes != null) {
+                for (var affixId : affixes) {
+                    var affix = GameData.getMonsterAffixDataMap().get(affixId.intValue());
+                    if(affix.isPreAdd()) continue;
+
+                    //Add the ability
+                    for(var name : affix.getAbilityName()) {
+                        this.addConfigAbility(name);
+                    }
+                }
+            }
+
+            var levelEntityConfig = getScene().getSceneData().getLevelEntityConfig();
+            var config = GameData.getConfigLevelEntityDataMap().get(levelEntityConfig);
+            if (config == null){
+                return;
+            }
+
+            if (config.getMonsterAbilities() != null) {
+                for (var monsterAbility : config.getMonsterAbilities()) {
+                    addConfigAbility(monsterAbility.abilityName);
+                }
+            }
+        }
+    }
+
+    @Override
+    public int getEntityTypeId() {
+        return getMonsterId();
    }

    public int getMonsterWeaponId() {
@@ -98,16 +203,16 @@ public class EntityMonster extends GameEntity {
    @Override
    public void onCreate() {
        // Lua event
-        getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_LIVE, new ScriptArgs(this.getConfigId()));
+        getScene().getScriptManager().callEvent(new ScriptArgs(this.getGroupId(), EventType.EVENT_ANY_MONSTER_LIVE, this.getConfigId()));
    }

    @Override
-    public void damage(float amount, int killerId) {
+    public void damage(float amount, int killerId, ElementType attackType) {
        // Get HP before damage.
        float hpBeforeDamage = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);

        // Apply damage.
-        super.damage(amount, killerId);
+        super.damage(amount, killerId, attackType);

        // Get HP after damage.
        float hpAfterDamage = this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
@@ -118,6 +223,15 @@ public class EntityMonster extends GameEntity {
        }
    }

+    @Override
+    public void runLuaCallbacks(EntityDamageEvent event) {
+        super.runLuaCallbacks(event);
+        getScene().getScriptManager().callEvent(new ScriptArgs(this.getGroupId(), EVENT_SPECIFIC_MONSTER_HP_CHANGE, getConfigId(), monsterData.getId())
+            .setSourceEntityId(getId())
+            .setParam3((int) this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP))
+            .setEventSource(Integer.toString(getConfigId())));
+    }
+
    @Override
    public void onDeath(int killerId) {
        super.onDeath(killerId); // Invoke super class's onDeath() method.
@@ -134,11 +248,26 @@ public class EntityMonster extends GameEntity {
            Optional.ofNullable(scriptManager.getScriptMonsterSpawnService()).ifPresent(s -> s.onMonsterDead(this));

            // prevent spawn monster after success
-            if (challenge.map(c -> c.inProgress()).orElse(true))
-                scriptManager.callEvent(EventType.EVENT_ANY_MONSTER_DIE, new ScriptArgs().setParam1(this.getConfigId()));
+            /*if (challenge.map(c -> c.inProgress()).orElse(true)) {
+                scriptManager.callEvent(new ScriptArgs(EventType.EVENT_ANY_MONSTER_DIE, this.getConfigId()).setGroupId(this.getGroupId()));
+            } else if (getScene().getChallenge() == null) {
+            }*/
+            scriptManager.callEvent(new ScriptArgs(this.getGroupId(), EventType.EVENT_ANY_MONSTER_DIE, this.getConfigId()));
        }
        // Battle Pass trigger
        scene.getPlayers().forEach(p -> p.getBattlePassManager().triggerMission(WatcherTriggerType.TRIGGER_MONSTER_DIE, this.getMonsterId(), 1));
+
+        scene.getPlayers().forEach(p -> p.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_MONSTER_DIE, this.getMonsterId()));
+        scene.getPlayers().forEach(p -> p.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_KILL_MONSTER, this.getMonsterId()));
+        scene.getPlayers().forEach(p -> p.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_CLEAR_GROUP_MONSTER, this.getGroupId()));
+
+        SceneGroupInstance groupInstance = scene.getScriptManager().getGroupInstanceById(this.getGroupId());
+        if(groupInstance != null && metaMonster != null)
+            groupInstance.getDeadEntities().add(metaMonster.config_id);
+
+        scene.triggerDungeonEvent(DungeonPassConditionType.DUNGEON_COND_KILL_GROUP_MONSTER, this.getGroupId());
+        scene.triggerDungeonEvent(DungeonPassConditionType.DUNGEON_COND_KILL_TYPE_MONSTER, this.getMonsterData().getType().getValue());
+        scene.triggerDungeonEvent(DungeonPassConditionType.DUNGEON_COND_KILL_MONSTER, this.getMonsterId());
    }

    public void recalcStats() {
@@ -173,54 +302,63 @@ public class EntityMonster extends GameEntity {

    @Override
    public SceneEntityInfo toProto() {
+        var data = this.getMonsterData();
+
        var authority = EntityAuthorityInfo.newBuilder()
-                .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
-                .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
-                .setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(this.getBornPos().toProto()))
-                .setBornPos(this.getBornPos().toProto())
-                .build();
+            .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+            .setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
+            .setAiInfo(SceneEntityAiInfo.newBuilder()
+                .setIsAiOpen(true)
+                .setBornPos(this.getBornPos().toProto()))
+            .setBornPos(this.getBornPos().toProto())
+            .build();

        var entityInfo = SceneEntityInfo.newBuilder()
-                .setEntityId(getId())
-                .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_MONSTER)
-                .setMotionInfo(this.getMotionInfo())
-                .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
-                .setEntityClientData(EntityClientData.newBuilder())
-                .setEntityAuthorityInfo(authority)
-                .setLifeState(this.getLifeState().getValue());
+            .setEntityId(this.getId())
+            .setEntityType(ProtEntityType.PROT_ENTITY_TYPE_MONSTER)
+            .setMotionInfo(this.getMotionInfo())
+            .addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
+            .setEntityClientData(EntityClientData.newBuilder())
+            .setEntityAuthorityInfo(authority)
+            .setLifeState(this.getLifeState().getValue());

        this.addAllFightPropsToEntityInfo(entityInfo);

        entityInfo.addPropList(PropPair.newBuilder()
            .setType(PlayerProperty.PROP_LEVEL.getId())
-            .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, getLevel()))
+            .setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, this.getLevel()))
            .build());

        var monsterInfo = SceneMonsterInfo.newBuilder()
-                .setMonsterId(getMonsterId())
-                .setGroupId(this.getGroupId())
-                .setConfigId(this.getConfigId())
-                .addAllAffixList(getMonsterData().getAffix())
-                .setAuthorityPeerId(getWorld().getHostPeerId())
-                .setPoseId(this.getPoseId())
-                .setBlockId(getScene().getId())
-                .setBornType(MonsterBornType.MONSTER_BORN_TYPE_DEFAULT);
+            .setMonsterId(getMonsterId())
+            .setGroupId(this.getGroupId())
+            .setConfigId(this.getConfigId())
+            .addAllAffixList(data.getAffix())
+            .setAuthorityPeerId(this.getWorld().getHostPeerId())
+            .setPoseId(this.getPoseId())
+            .setBlockId(this.getScene().getId())
+            .setBornType(MonsterBornType.MONSTER_BORN_TYPE_DEFAULT);

-        if (getMonsterData().getDescribeData() != null) {
-            monsterInfo.setTitleId(getMonsterData().getDescribeData().getTitleId())
-                .setSpecialNameId(getMonsterData().getSpecialNameId());
+        if (this.metaMonster != null) {
+            if (this.metaMonster.special_name_id != 0) {
+                monsterInfo.setTitleId(this.metaMonster.title_id)
+                    .setSpecialNameId(this.metaMonster.special_name_id);
+            } else if (data.getDescribeData() != null) {
+                monsterInfo.setTitleId(data.getDescribeData().getTitleId())
+                    .setSpecialNameId(data.getSpecialNameId());
+            }
        }

        if (this.getMonsterWeaponId() > 0) {
            SceneWeaponInfo weaponInfo = SceneWeaponInfo.newBuilder()
-                    .setEntityId(this.weaponEntityId)
-                    .setGadgetId(this.getMonsterWeaponId())
-                    .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
-                    .build();
+                .setEntityId(this.getWeaponEntity() != null ? this.getWeaponEntity().getId() : 0)
+                .setGadgetId(this.getMonsterWeaponId())
+                .setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+                .build();

            monsterInfo.addWeaponList(weaponInfo);
        }
-        if (this.aiId!=-1) {
+        if (this.aiId != -1) {
            monsterInfo.setAiConfigId(aiId);
        }

@@ -228,4 +366,4 @@ public class EntityMonster extends GameEntity {

        return entityInfo.build();
    }
-}
+}