Continue updating/refactoring classes

Most code is matched from `Grasscutter-Quests`.

src/main/java/emu/grasscutter/server/packet/recv/HandlerAddQuestContentProgressReq.java

@@ -1,41 +1,26 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.QuestData.QuestCondition;
-import emu.grasscutter.game.quest.enums.QuestTrigger;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAddQuestContentProgressRsp;
-import java.util.List;
-import java.util.stream.Stream;
-
-@Opcodes(PacketOpcodes.AddQuestContentProgressReq)
-public class HandlerAddQuestContentProgressReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var req = AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.parseFrom(payload);
-        // Find all conditions in quest that are the same as the given one
-        Stream<QuestCondition> finishCond =
-                GameData.getQuestDataMap().get(req.getParam()).getFinishCond().stream();
-        Stream<QuestCondition> acceptCond =
-                GameData.getQuestDataMap().get(req.getParam()).getAcceptCond().stream();
-        Stream<QuestCondition> failCond =
-                GameData.getQuestDataMap().get(req.getParam()).getFailCond().stream();
-        List<QuestCondition> allCondMatch =
-                Stream.concat(Stream.concat(acceptCond, failCond), finishCond)
-                        .filter(p -> p.getType().getValue() == req.getContentType())
-                        .toList();
-        for (QuestCondition cond : allCondMatch) {
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .triggerEvent(
-                            QuestTrigger.getContentTriggerByValue(req.getContentType()), cond.getParam());
-        }
-        session.send(new PacketAddQuestContentProgressRsp(req.getContentType()));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAddQuestContentProgressRsp;
+
+@Opcodes(PacketOpcodes.AddQuestContentProgressReq)
+public class HandlerAddQuestContentProgressReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var req = AddQuestContentProgressReq.parseFrom(payload);
+
+        // Find all conditions in quest that are the same as the given one
+        var type = QuestContent.getContentTriggerByValue(req.getContentType());
+        if(type != null) {
+            session.getPlayer().getQuestManager().queueEvent(type, req.getParam());
+        }
+
+        session.send(new PacketAddQuestContentProgressRsp(req.getContentType()));
+    }
+
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeElementTypeReq.java

@@ -1,69 +1,39 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
-import emu.grasscutter.data.excels.world.WorldAreaData;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq;
-import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAbilityChangeNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarChangeElementTypeRsp;
-import emu.grasscutter.server.packet.send.PacketAvatarFightPropNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarSkillDepotChangeNotify;
-
-@Opcodes(PacketOpcodes.AvatarChangeElementTypeReq)
-public class HandlerAvatarChangeElementTypeReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        AvatarChangeElementTypeReq req = AvatarChangeElementTypeReq.parseFrom(payload);
-
-        WorldAreaData area = GameData.getWorldAreaDataMap().get(req.getAreaId());
-
-        if (area == null
-                || area.getElementType() == null
-                || area.getElementType().getDepotValue() <= 0) {
-            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-            return;
-        }
-
-        // Get current avatar, should be one of the main characters
-        EntityAvatar mainCharacterEntity =
-                session.getPlayer().getTeamManager().getCurrentAvatarEntity();
-        Avatar mainCharacter = mainCharacterEntity.getAvatar();
-
-        int skillDepotId = area.getElementType().getDepotValue();
-        switch (mainCharacter.getAvatarId()) {
-            case GameConstants.MAIN_CHARACTER_MALE -> skillDepotId += 500;
-            case GameConstants.MAIN_CHARACTER_FEMALE -> skillDepotId += 700;
-            default -> {
-                session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-                return;
-            }
-        }
-
-        // Sanity checks for skill depots
-        AvatarSkillDepotData skillDepot = GameData.getAvatarSkillDepotDataMap().get(skillDepotId);
-        if (skillDepot == null || skillDepot.getId() == mainCharacter.getSkillDepotId()) {
-            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-            return;
-        }
-
-        // Set skill depot
-        mainCharacter.setSkillDepotData(skillDepot);
-
-        // Success
-        session.send(new PacketAvatarChangeElementTypeRsp());
-
-        // Ability change packet
-        session.send(new PacketAvatarSkillDepotChangeNotify(mainCharacter));
-        session.send(new PacketAbilityChangeNotify(mainCharacterEntity));
-        session.send(new PacketAvatarFightPropNotify(mainCharacter));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAvatarChangeElementTypeRsp;
+import lombok.val;
+
+/**
+ * Changes the currently active avatars Element if possible
+ */
+@Opcodes(PacketOpcodes.AvatarChangeElementTypeReq)
+public class HandlerAvatarChangeElementTypeReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var req = AvatarChangeElementTypeReq.parseFrom(payload);
+        var area = GameData.getWorldAreaDataMap().get(req.getAreaId());
+
+        if (area == null || area.getElementType() == null || area.getElementType().getDepotIndex() <= 0) {
+            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
+            return;
+        }
+
+        val avatar = session.getPlayer().getTeamManager().getCurrentAvatarEntity().getAvatar();
+        if (!avatar.changeElement(area.getElementType())) {
+            session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
+            return;
+        }
+
+        // Success
+        session.send(new PacketAvatarChangeElementTypeRsp());
+    }
+
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java

@@ -1,191 +1,191 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
-import emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify;
-import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
-import emu.grasscutter.net.proto.EntityMoveInfoOuterClass.EntityMoveInfo;
-import emu.grasscutter.net.proto.EvtAnimatorParameterInfoOuterClass.EvtAnimatorParameterInfo;
-import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
-import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
-import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
-import emu.grasscutter.net.proto.PlayerDieTypeOuterClass;
-import emu.grasscutter.server.event.entity.EntityMoveEvent;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import emu.grasscutter.utils.Position;
-
-@Opcodes(PacketOpcodes.CombatInvocationsNotify)
-public class HandlerCombatInvocationsNotify extends PacketHandler {
-
-    private float cachedLandingSpeed = 0;
-    private long cachedLandingTimeMillisecond = 0;
-    private boolean monitorLandingEvent = false;
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        CombatInvocationsNotify notif = CombatInvocationsNotify.parseFrom(payload);
-        for (CombatInvokeEntry entry : notif.getInvokeListList()) {
-            // Handle combat invoke
-            switch (entry.getArgumentType()) {
-                case COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT -> {
-                    EvtBeingHitInfo hitInfo = EvtBeingHitInfo.parseFrom(entry.getCombatData());
-                    AttackResult attackResult = hitInfo.getAttackResult();
-                    Player player = session.getPlayer();
-
-                    // Check if the player is invulnerable.
-                    if (attackResult.getAttackerId()
-                                    != player.getTeamManager().getCurrentAvatarEntity().getId()
-                            && player.getAbilityManager().isAbilityInvulnerable()) break;
-
-                    // Handle damage
-                    player.getAttackResults().add(attackResult);
-                    player.getEnergyManager().handleAttackHit(hitInfo);
-                }
-                case COMBAT_TYPE_ARGUMENT_ENTITY_MOVE -> {
-                    // Handle movement
-                    EntityMoveInfo moveInfo = EntityMoveInfo.parseFrom(entry.getCombatData());
-                    GameEntity entity = session.getPlayer().getScene().getEntityById(moveInfo.getEntityId());
-                    if (entity != null) {
-                        // Move player
-                        MotionInfo motionInfo = moveInfo.getMotionInfo();
-                        MotionState motionState = motionInfo.getState();
-
-                        // Call entity move event.
-                        EntityMoveEvent event =
-                                new EntityMoveEvent(
-                                        entity,
-                                        new Position(motionInfo.getPos()),
-                                        new Position(motionInfo.getRot()),
-                                        motionState);
-                        event.call();
-
-                        entity.move(event.getPosition(), event.getRotation());
-                        entity.setLastMoveSceneTimeMs(moveInfo.getSceneTime());
-                        entity.setLastMoveReliableSeq(moveInfo.getReliableSeq());
-                        entity.setMotionState(motionState);
-
-                        session
-                                .getPlayer()
-                                .getStaminaManager()
-                                .handleCombatInvocationsNotify(session, moveInfo, entity);
-
-                        // TODO: handle MOTION_FIGHT landing which has a different damage factor
-                        // 		Also, for plunge attacks, LAND_SPEED is always -30 and is not useful.
-                        //  	May need the height when starting plunge attack.
-
-                        // MOTION_LAND_SPEED and MOTION_FALL_ON_GROUND arrive in different packets.
-                        // Cache land speed for later use.
-                        if (motionState == MotionState.MOTION_STATE_LAND_SPEED) {
-                            cachedLandingSpeed = motionInfo.getSpeed().getY();
-                            cachedLandingTimeMillisecond = System.currentTimeMillis();
-                            monitorLandingEvent = true;
-                        }
-                        if (monitorLandingEvent) {
-                            if (motionState == MotionState.MOTION_STATE_FALL_ON_GROUND) {
-                                monitorLandingEvent = false;
-                                handleFallOnGround(session, entity, motionState);
-                            }
-                        }
-
-                        // MOTION_STATE_NOTIFY = Dont send to other players
-                        if (motionState == MotionState.MOTION_STATE_NOTIFY) {
-                            continue;
-                        }
-                    }
-                }
-                case COMBAT_TYPE_ARGUMENT_ANIMATOR_PARAMETER_CHANGED -> {
-                    EvtAnimatorParameterInfo paramInfo =
-                            EvtAnimatorParameterInfo.parseFrom(entry.getCombatData());
-                    if (paramInfo.getIsServerCache()) {
-                        paramInfo = paramInfo.toBuilder().setIsServerCache(false).build();
-                        entry = entry.toBuilder().setCombatData(paramInfo.toByteString()).build();
-                    }
-                }
-                default -> {}
-            }
-
-            session.getPlayer().getCombatInvokeHandler().addEntry(entry.getForwardType(), entry);
-        }
-    }
-
-    private void handleFallOnGround(GameSession session, GameEntity entity, MotionState motionState) {
-        if (session.getPlayer().inGodmode()) {
-            return;
-        }
-        // People have reported that after plunge attack (client sends a FIGHT instead of
-        // FALL_ON_GROUND) they will die
-        // 		if they talk to an NPC (this is when the client sends a FALL_ON_GROUND) without jumping
-        // again.
-        // A dirty patch: if not received immediately after MOTION_LAND_SPEED, discard this packet.
-        // 200ms seems to be a reasonable delay.
-        int maxDelay = 200;
-        long actualDelay = System.currentTimeMillis() - cachedLandingTimeMillisecond;
-        Grasscutter.getLogger()
-                .trace(
-                        "MOTION_FALL_ON_GROUND received after "
-                                + actualDelay
-                                + "/"
-                                + maxDelay
-                                + "ms."
-                                + (actualDelay > maxDelay ? " Discard" : ""));
-        if (actualDelay > maxDelay) {
-            return;
-        }
-        float currentHP = entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-        float maxHP = entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-        float damageFactor = 0;
-        if (cachedLandingSpeed < -23.5) {
-            damageFactor = 0.33f;
-        }
-        if (cachedLandingSpeed < -25) {
-            damageFactor = 0.5f;
-        }
-        if (cachedLandingSpeed < -26.5) {
-            damageFactor = 0.66f;
-        }
-        if (cachedLandingSpeed < -28) {
-            damageFactor = 1f;
-        }
-        float damage = maxHP * damageFactor;
-        float newHP = currentHP - damage;
-        if (newHP < 0) {
-            newHP = 0;
-        }
-        if (damageFactor > 0) {
-            Grasscutter.getLogger()
-                    .debug(
-                            currentHP
-                                    + "/"
-                                    + maxHP
-                                    + "\tLandingSpeed: "
-                                    + cachedLandingSpeed
-                                    + "\tDamageFactor: "
-                                    + damageFactor
-                                    + "\tDamage: "
-                                    + damage
-                                    + "\tNewHP: "
-                                    + newHP);
-        } else {
-            Grasscutter.getLogger().trace(currentHP + "/" + maxHP + "\tLandingSpeed: 0\tNo damage");
-        }
-        entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
-        entity
-                .getWorld()
-                .broadcastPacket(
-                        new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
-        if (newHP == 0) {
-            session
-                    .getPlayer()
-                    .getStaminaManager()
-                    .killAvatar(session, entity, PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_FALL);
-        }
-        cachedLandingSpeed = 0;
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
+import emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify;
+import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
+import emu.grasscutter.net.proto.EntityMoveInfoOuterClass.EntityMoveInfo;
+import emu.grasscutter.net.proto.EvtAnimatorParameterInfoOuterClass.EvtAnimatorParameterInfo;
+import emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo;
+import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
+import emu.grasscutter.net.proto.PlayerDieTypeOuterClass;
+import emu.grasscutter.server.event.entity.EntityMoveEvent;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
+import emu.grasscutter.utils.Position;
+
+@Opcodes(PacketOpcodes.CombatInvocationsNotify)
+public class HandlerCombatInvocationsNotify extends PacketHandler {
+
+    private float cachedLandingSpeed = 0;
+    private long cachedLandingTimeMillisecond = 0;
+    private boolean monitorLandingEvent = false;
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        CombatInvocationsNotify notif = CombatInvocationsNotify.parseFrom(payload);
+        for (CombatInvokeEntry entry : notif.getInvokeListList()) {
+            // Handle combat invoke
+            switch (entry.getArgumentType()) {
+                case COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT -> {
+                    EvtBeingHitInfo hitInfo = EvtBeingHitInfo.parseFrom(entry.getCombatData());
+                    AttackResult attackResult = hitInfo.getAttackResult();
+                    Player player = session.getPlayer();
+
+                    // Check if the player is invulnerable.
+                    if (attackResult.getAttackerId()
+                                    != player.getTeamManager().getCurrentAvatarEntity().getId()
+                            && player.getAbilityManager().isAbilityInvulnerable()) break;
+
+                    // Handle damage
+                    player.getAttackResults().add(attackResult);
+                    player.getEnergyManager().handleAttackHit(hitInfo);
+                }
+                case COMBAT_TYPE_ARGUMENT_ENTITY_MOVE -> {
+                    // Handle movement
+                    EntityMoveInfo moveInfo = EntityMoveInfo.parseFrom(entry.getCombatData());
+                    GameEntity entity = session.getPlayer().getScene().getEntityById(moveInfo.getEntityId());
+                    if (entity != null) {
+                        // Move player
+                        MotionInfo motionInfo = moveInfo.getMotionInfo();
+                        MotionState motionState = motionInfo.getState();
+
+                        // Call entity move event.
+                        EntityMoveEvent event =
+                                new EntityMoveEvent(
+                                        entity,
+                                        new Position(motionInfo.getPos()),
+                                        new Position(motionInfo.getRot()),
+                                        motionState);
+                        event.call();
+
+                        entity.move(event.getPosition(), event.getRotation());
+                        entity.setLastMoveSceneTimeMs(moveInfo.getSceneTime());
+                        entity.setLastMoveReliableSeq(moveInfo.getReliableSeq());
+                        entity.setMotionState(motionState);
+
+                        session
+                                .getPlayer()
+                                .getStaminaManager()
+                                .handleCombatInvocationsNotify(session, moveInfo, entity);
+
+                        // TODO: handle MOTION_FIGHT landing which has a different damage factor
+                        // 		Also, for plunge attacks, LAND_SPEED is always -30 and is not useful.
+                        //  	May need the height when starting plunge attack.
+
+                        // MOTION_LAND_SPEED and MOTION_FALL_ON_GROUND arrive in different packets.
+                        // Cache land speed for later use.
+                        if (motionState == MotionState.MOTION_STATE_LAND_SPEED) {
+                            cachedLandingSpeed = motionInfo.getSpeed().getY();
+                            cachedLandingTimeMillisecond = System.currentTimeMillis();
+                            monitorLandingEvent = true;
+                        }
+                        if (monitorLandingEvent) {
+                            if (motionState == MotionState.MOTION_STATE_FALL_ON_GROUND) {
+                                monitorLandingEvent = false;
+                                handleFallOnGround(session, entity, motionState);
+                            }
+                        }
+
+                        // MOTION_STATE_NOTIFY = Dont send to other players
+                        if (motionState == MotionState.MOTION_STATE_NOTIFY) {
+                            continue;
+                        }
+                    }
+                }
+                case COMBAT_TYPE_ARGUMENT_ANIMATOR_PARAMETER_CHANGED -> {
+                    EvtAnimatorParameterInfo paramInfo =
+                            EvtAnimatorParameterInfo.parseFrom(entry.getCombatData());
+                    if (paramInfo.getIsServerCache()) {
+                        paramInfo = paramInfo.toBuilder().setIsServerCache(false).build();
+                        entry = entry.toBuilder().setCombatData(paramInfo.toByteString()).build();
+                    }
+                }
+                default -> {}
+            }
+
+            session.getPlayer().getCombatInvokeHandler().addEntry(entry.getForwardType(), entry);
+        }
+    }
+
+    private void handleFallOnGround(GameSession session, GameEntity entity, MotionState motionState) {
+        if (session.getPlayer().isInGodMode()) {
+            return;
+        }
+        // People have reported that after plunge attack (client sends a FIGHT instead of
+        // FALL_ON_GROUND) they will die
+        // 		if they talk to an NPC (this is when the client sends a FALL_ON_GROUND) without jumping
+        // again.
+        // A dirty patch: if not received immediately after MOTION_LAND_SPEED, discard this packet.
+        // 200ms seems to be a reasonable delay.
+        int maxDelay = 200;
+        long actualDelay = System.currentTimeMillis() - cachedLandingTimeMillisecond;
+        Grasscutter.getLogger()
+                .trace(
+                        "MOTION_FALL_ON_GROUND received after "
+                                + actualDelay
+                                + "/"
+                                + maxDelay
+                                + "ms."
+                                + (actualDelay > maxDelay ? " Discard" : ""));
+        if (actualDelay > maxDelay) {
+            return;
+        }
+        float currentHP = entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+        float maxHP = entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+        float damageFactor = 0;
+        if (cachedLandingSpeed < -23.5) {
+            damageFactor = 0.33f;
+        }
+        if (cachedLandingSpeed < -25) {
+            damageFactor = 0.5f;
+        }
+        if (cachedLandingSpeed < -26.5) {
+            damageFactor = 0.66f;
+        }
+        if (cachedLandingSpeed < -28) {
+            damageFactor = 1f;
+        }
+        float damage = maxHP * damageFactor;
+        float newHP = currentHP - damage;
+        if (newHP < 0) {
+            newHP = 0;
+        }
+        if (damageFactor > 0) {
+            Grasscutter.getLogger()
+                    .debug(
+                            currentHP
+                                    + "/"
+                                    + maxHP
+                                    + "\tLandingSpeed: "
+                                    + cachedLandingSpeed
+                                    + "\tDamageFactor: "
+                                    + damageFactor
+                                    + "\tDamage: "
+                                    + damage
+                                    + "\tNewHP: "
+                                    + newHP);
+        } else {
+            Grasscutter.getLogger().trace(currentHP + "/" + maxHP + "\tLandingSpeed: 0\tNo damage");
+        }
+        entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
+        entity
+                .getWorld()
+                .broadcastPacket(
+                        new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
+        if (newHP == 0) {
+            session
+                    .getPlayer()
+                    .getStaminaManager()
+                    .killAvatar(session, entity, PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_FALL);
+        }
+        cachedLandingSpeed = 0;
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java

@@ -1,28 +1,29 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify;
-import emu.grasscutter.server.game.GameSession;
-
-@Opcodes(PacketOpcodes.EvtDoSkillSuccNotify)
-public class HandlerEvtDoSkillSuccNotify extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        EvtDoSkillSuccNotify notify = EvtDoSkillSuccNotify.parseFrom(payload);
-
-        var player = session.getPlayer();
-        int skillId = notify.getSkillId();
-        int casterId = notify.getCasterId();
-
-        // Call skill perform in the player's ability manager.
-        player.getAbilityManager().onSkillStart(session.getPlayer(), skillId, casterId);
-
-        // Handle skill notify in other managers.
-        player.getStaminaManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
-        player.getEnergyManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
-        player.getQuestManager().triggerEvent(QuestContent.QUEST_CONTENT_SKILL, skillId, 0);
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify;
+import emu.grasscutter.server.game.GameSession;
+
+@Opcodes(PacketOpcodes.EvtDoSkillSuccNotify)
+public class HandlerEvtDoSkillSuccNotify extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        EvtDoSkillSuccNotify notify = EvtDoSkillSuccNotify.parseFrom(payload);
+
+        var player = session.getPlayer();
+        int skillId = notify.getSkillId();
+        int casterId = notify.getCasterId();
+
+        // Call skill perform in the player's ability manager.
+        player.getAbilityManager().onSkillStart(session.getPlayer(), skillId, casterId);
+
+        // Handle skill notify in other managers.
+        player.getStaminaManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
+        player.getEnergyManager().handleEvtDoSkillSuccNotify(session, skillId, casterId);
+        player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_SKILL, skillId, 0);
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerExecuteGadgetLuaReq.java

@@ -1,29 +1,29 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketExecuteGadgetLuaRsp;
-
-@Opcodes(PacketOpcodes.ExecuteGadgetLuaReq)
-public class HandlerExecuteGadgetLuaReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        ExecuteGadgetLuaReq req = ExecuteGadgetLuaReq.parseFrom(payload);
-
-        Player player = session.getPlayer();
-        GameEntity entity = player.getScene().getEntities().get(req.getSourceEntityId());
-
-        int result = 1;
-        if (entity instanceof EntityGadget gadget)
-            result = gadget.onClientExecuteRequest(req.getParam1(), req.getParam2(), req.getParam3());
-
-        player.sendPacket(new PacketExecuteGadgetLuaRsp(result));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketExecuteGadgetLuaRsp;
+
+@Opcodes(PacketOpcodes.ExecuteGadgetLuaReq)
+public class HandlerExecuteGadgetLuaReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        ExecuteGadgetLuaReq req = ExecuteGadgetLuaReq.parseFrom(payload);
+
+        Player player = session.getPlayer();
+        GameEntity entity = player.getScene().getEntities().get(req.getSourceEntityId());
+
+        int result = 1;
+        if (entity instanceof EntityGadget gadget)
+            result = gadget.onClientExecuteRequest(req.getParam1(), req.getParam2(), req.getParam3());
+
+        player.sendPacket(new PacketExecuteGadgetLuaRsp(result));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java

@@ -1,22 +1,23 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
-import emu.grasscutter.server.game.GameSession;
-
-@Opcodes(PacketOpcodes.GadgetInteractReq)
-public class HandlerGadgetInteractReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        GadgetInteractReq req = GadgetInteractReq.parseFrom(payload);
-
-        session
-                .getPlayer()
-                .getQuestManager()
-                .triggerEvent(QuestContent.QUEST_CONTENT_INTERACT_GADGET, req.getGadgetId());
-        session.getPlayer().interactWith(req.getGadgetEntityId(), req);
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
+import emu.grasscutter.server.game.GameSession;
+
+@Opcodes(PacketOpcodes.GadgetInteractReq)
+public class HandlerGadgetInteractReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        GadgetInteractReq req = GadgetInteractReq.parseFrom(payload);
+
+        session
+                .getPlayer()
+                .getQuestManager()
+                .queueEvent(QuestContent.QUEST_CONTENT_INTERACT_GADGET, req.getGadgetId());
+        session.getPlayer().interactWith(req.getGadgetEntityId(), req);
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java

@@ -1,67 +1,66 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.activity.musicgame.MusicGameActivityHandler;
-import emu.grasscutter.game.activity.musicgame.MusicGamePlayerData;
-import emu.grasscutter.game.props.ActivityType;
-import emu.grasscutter.game.props.WatcherTriggerType;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
-import emu.grasscutter.server.packet.send.PacketMusicGameSettleRsp;
-
-@Opcodes(PacketOpcodes.MusicGameSettleReq)
-public class HandlerMusicGameSettleReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var req = MusicGameSettleReqOuterClass.MusicGameSettleReq.parseFrom(payload);
-
-        var playerData =
-                session
-                        .getPlayer()
-                        .getActivityManager()
-                        .getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
-        if (playerData.isEmpty()) {
-            return;
-        }
-        var handler = (MusicGameActivityHandler) playerData.get().getActivityHandler();
-        boolean isNewRecord = false;
-        // check if custom beatmap
-
-        if (req.getUgcGuid() == 0) {
-            session
-                    .getPlayer()
-                    .getActivityManager()
-                    .triggerWatcher(
-                            WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
-                            String.valueOf(req.getMusicBasicId()),
-                            String.valueOf(req.getScore()));
-
-            isNewRecord =
-                    handler.setMusicGameRecord(
-                            playerData.get(),
-                            MusicGamePlayerData.MusicGameRecord.of()
-                                    .musicId(req.getMusicBasicId())
-                                    .maxCombo(req.getMaxCombo())
-                                    .maxScore(req.getScore())
-                                    .build());
-
-            // update activity info
-            session.send(new PacketActivityInfoNotify(handler.toProto(playerData.get())));
-        } else {
-            handler.setMusicGameCustomBeatmapRecord(
-                    playerData.get(),
-                    MusicGamePlayerData.CustomBeatmapRecord.of()
-                            .musicShareId(req.getUgcGuid())
-                            .score(req.getMaxCombo())
-                            //                    .settle(req.getSuccess())
-                            .build());
-        }
-
-        session.send(
-                new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getUgcGuid(), isNewRecord));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.activity.musicgame.MusicGameActivityHandler;
+import emu.grasscutter.game.activity.musicgame.MusicGamePlayerData;
+import emu.grasscutter.game.props.ActivityType;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq;
+import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
+import emu.grasscutter.server.packet.send.PacketMusicGameSettleRsp;
+import lombok.val;
+
+@Opcodes(PacketOpcodes.MusicGameSettleReq)
+public class HandlerMusicGameSettleReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        val req = MusicGameSettleReq.parseFrom(payload);
+
+        val activityManager = session.getPlayer().getActivityManager();
+
+        val playerDataOpt = activityManager.getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
+        if (playerDataOpt.isEmpty()) {
+            session.send(new PacketMusicGameSettleRsp(RetcodeOuterClass.Retcode.RET_MUSIC_GAME_LEVEL_CONFIG_NOT_FOUND, req));
+            return;
+        }
+
+        val playerData = playerDataOpt.get();
+        val handler = (MusicGameActivityHandler) playerData.getActivityHandler();
+        boolean isNewRecord = false;
+
+        // check if custom beatmap
+        if (req.getUgcGuid() == 0) {
+            session.getPlayer().getActivityManager().triggerWatcher(
+                WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
+                String.valueOf(req.getMusicBasicId()),
+                String.valueOf(req.getScore())
+            );
+
+            isNewRecord = handler.setMusicGameRecord(playerData,
+                MusicGamePlayerData.MusicGameRecord.of()
+                    .musicId(req.getMusicBasicId())
+                    .maxCombo(req.getMaxCombo())
+                    .maxScore(req.getScore())
+                    .build());
+
+            // update activity info
+            session.send(new PacketActivityInfoNotify(handler.toProto(playerData, activityManager.getConditionExecutor())));
+        } else {
+            handler.setMusicGameCustomBeatmapRecord(playerData,
+                MusicGamePlayerData.CustomBeatmapRecord.of()
+                    .musicShareId(req.getUgcGuid())
+                    .score(req.getMaxCombo())
+                    .settle(req.getIsSaveScore())
+                    .build());
+        }
+
+
+        session.send(new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getUgcGuid(), isNewRecord));
+    }
+
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java

@@ -1,66 +1,67 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.binout.MainQuestData;
-import emu.grasscutter.data.binout.MainQuestData.TalkData;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketNpcTalkRsp;
-
-@Opcodes(PacketOpcodes.NpcTalkReq)
-public class HandlerNpcTalkReq extends PacketHandler {
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        NpcTalkReq req = NpcTalkReq.parseFrom(payload);
-
-        // Check if mainQuest exists
-        // remove last 2 digits to get a mainQuestId
-        int talkId = req.getTalkId();
-        int mainQuestId = talkId / 100;
-        MainQuestData mainQuestData = GameData.getMainQuestDataMap().get(mainQuestId);
-
-        if (mainQuestData != null) {
-            // This talk is associated with a quest. Handle it.
-            // If the quest has no talk data defined on it, create one.
-            TalkData talkForQuest = new TalkData(talkId, "");
-            if (mainQuestData.getTalks() != null) {
-                var talks = mainQuestData.getTalks().stream().filter(p -> p.getId() == talkId).toList();
-
-                if (talks.size() > 0) {
-                    talkForQuest = talks.get(0);
-                }
-            }
-
-            // Add to the list of done talks for this quest.
-            var mainQuest = session.getPlayer().getQuestManager().getMainQuestById(mainQuestId);
-            if (mainQuest != null) {
-                session
-                        .getPlayer()
-                        .getQuestManager()
-                        .getMainQuestById(mainQuestId)
-                        .getTalks()
-                        .put(talkId, talkForQuest);
-            }
-
-            // Fire quest triggers.
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .triggerEvent(
-                            QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK, String.valueOf(req.getTalkId()), 0, 0);
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .triggerEvent(QuestContent.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId(), 0);
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .triggerEvent(QuestContent.QUEST_CONTENT_FINISH_PLOT, req.getTalkId(), 0);
-        }
-
-        session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.MainQuestData;
+import emu.grasscutter.data.binout.MainQuestData.TalkData;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketNpcTalkRsp;
+
+@Opcodes(PacketOpcodes.NpcTalkReq)
+public class HandlerNpcTalkReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        NpcTalkReq req = NpcTalkReq.parseFrom(payload);
+
+        // Check if mainQuest exists
+        // remove last 2 digits to get a mainQuestId
+        int talkId = req.getTalkId();
+        int mainQuestId = talkId / 100;
+        MainQuestData mainQuestData = GameData.getMainQuestDataMap().get(mainQuestId);
+
+        if (mainQuestData != null) {
+            // This talk is associated with a quest. Handle it.
+            // If the quest has no talk data defined on it, create one.
+            TalkData talkForQuest = new TalkData(talkId, "");
+            if (mainQuestData.getTalks() != null) {
+                var talks = mainQuestData.getTalks().stream().filter(p -> p.getId() == talkId).toList();
+
+                if (talks.size() > 0) {
+                    talkForQuest = talks.get(0);
+                }
+            }
+
+            // Add to the list of done talks for this quest.
+            var mainQuest = session.getPlayer().getQuestManager().getMainQuestById(mainQuestId);
+            if (mainQuest != null) {
+                session
+                        .getPlayer()
+                        .getQuestManager()
+                        .getMainQuestById(mainQuestId)
+                        .getTalks()
+                        .put(talkId, talkForQuest);
+            }
+
+            // Fire quest triggers.
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(
+                            QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK, String.valueOf(req.getTalkId()), 0, 0);
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(QuestContent.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId(), 0);
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(QuestContent.QUEST_CONTENT_FINISH_PLOT, req.getTalkId(), 0);
+        }
+
+        session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java

@@ -1,24 +1,25 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.props.SceneType;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketPostEnterSceneRsp;
-
-@Opcodes(PacketOpcodes.PostEnterSceneReq)
-public class HandlerPostEnterSceneReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        if (session.getPlayer().getScene().getSceneType() == SceneType.SCENE_ROOM) {
-            session
-                    .getPlayer()
-                    .getQuestManager()
-                    .triggerEvent(QuestContent.QUEST_CONTENT_ENTER_ROOM, session.getPlayer().getSceneId(), 0);
-        }
-
-        session.send(new PacketPostEnterSceneRsp(session.getPlayer()));
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.props.SceneType;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketPostEnterSceneRsp;
+
+@Opcodes(PacketOpcodes.PostEnterSceneReq)
+public class HandlerPostEnterSceneReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        if (session.getPlayer().getScene().getSceneType() == SceneType.SCENE_ROOM) {
+            session
+                    .getPlayer()
+                    .getQuestManager()
+                    .queueEvent(QuestContent.QUEST_CONTENT_ENTER_ROOM, session.getPlayer().getSceneId(), 0);
+        }
+
+        session.send(new PacketPostEnterSceneRsp(session.getPlayer()));
+    }
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerSelectWorktopOptionReq.java

@@ -1,40 +1,39 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq;
-import emu.grasscutter.scripts.constants.EventType;
-import emu.grasscutter.scripts.data.ScriptArgs;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketSelectWorktopOptionRsp;
-
-@Opcodes(PacketOpcodes.SelectWorktopOptionReq)
-public class HandlerSelectWorktopOptionReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        SelectWorktopOptionReq req = SelectWorktopOptionReq.parseFrom(payload);
-
-        try {
-            GameEntity entity = session.getPlayer().getScene().getEntityById(req.getGadgetEntityId());
-
-            if (!(entity instanceof EntityGadget)) {
-                return;
-            }
-            session.getPlayer().getScene().selectWorktopOptionWith(req);
-            session
-                    .getPlayer()
-                    .getScene()
-                    .getScriptManager()
-                    .callEvent(
-                            EventType.EVENT_SELECT_OPTION,
-                            new ScriptArgs(entity.getConfigId(), req.getOptionId()));
-        } finally {
-            // Always send packet
-            session.send(new PacketSelectWorktopOptionRsp(req.getGadgetEntityId(), req.getOptionId()));
-        }
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.ScriptArgs;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketSelectWorktopOptionRsp;
+
+@Opcodes(PacketOpcodes.SelectWorktopOptionReq)
+public class HandlerSelectWorktopOptionReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        SelectWorktopOptionReq req = SelectWorktopOptionReq.parseFrom(payload);
+
+        try {
+            GameEntity entity = session.getPlayer().getScene().getEntityById(req.getGadgetEntityId());
+
+            if (!(entity instanceof EntityGadget)) {
+                return;
+            }
+            session.getPlayer().getScene().selectWorktopOptionWith(req);
+            session.getPlayer().getScene().getScriptManager().callEvent(
+                new ScriptArgs(entity.getGroupId(), EventType.EVENT_SELECT_OPTION, entity.getConfigId(), req.getOptionId())
+            );
+            session.getPlayer().getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_WORKTOP_SELECT, entity.getConfigId(), req.getOptionId());
+        } finally {
+            // Always send packet
+            session.send(new PacketSelectWorktopOptionRsp(req.getGadgetEntityId(), req.getOptionId()));
+        }
+    }
+
+}

src/main/java/emu/grasscutter/server/packet/recv/HandlerSkipPlayerGameTimeReq.java

@@ -14,7 +14,7 @@ public class HandlerSkipPlayerGameTimeReq extends PacketHandler {
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
         var req = SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.parseFrom(payload);
         var player = session.getPlayer();
-        player.getScene().setTime(req.getGameTime());
+        player.updatePlayerGameTime(req.getGameTime());
         player.getScene().broadcastPacket(new PacketPlayerGameTimeNotify(player));
         player.sendPacket(new PacketSkipPlayerGameTimeRsp(req));
     }

src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdateAbilityCreatedMovingPlatformNotify.java

@@ -1,34 +1,27 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.entity.platform.EntityPlatform;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.UpdateAbilityCreatedMovingPlatformNotifyOuterClass;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketPlatformStartRouteNotify;
-import emu.grasscutter.server.packet.send.PacketPlatformStopRouteNotify;
-
-@Opcodes(PacketOpcodes.UpdateAbilityCreatedMovingPlatformNotify)
-public class HandlerUpdateAbilityCreatedMovingPlatformNotify extends PacketHandler {
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        var notify =
-                UpdateAbilityCreatedMovingPlatformNotifyOuterClass.UpdateAbilityCreatedMovingPlatformNotify
-                        .parseFrom(payload);
-        var entity = session.getPlayer().getScene().getEntityById(notify.getEntityId());
-
-        if (!(entity instanceof EntityPlatform)) {
-            return;
-        }
-
-        var scene = ((EntityPlatform) entity).getOwner().getScene();
-
-        switch (notify.getOpType()) {
-            case OP_TYPE_ACTIVATE -> scene.broadcastPacket(
-                    new PacketPlatformStartRouteNotify((EntityPlatform) entity, scene));
-            case OP_TYPE_DEACTIVATE -> scene.broadcastPacket(
-                    new PacketPlatformStopRouteNotify((EntityPlatform) entity, scene));
-        }
-    }
-}
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.gadget.platform.AbilityRoute;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.UpdateAbilityCreatedMovingPlatformNotifyOuterClass.UpdateAbilityCreatedMovingPlatformNotify;
+import emu.grasscutter.server.game.GameSession;
+
+@Opcodes(PacketOpcodes.UpdateAbilityCreatedMovingPlatformNotify)
+public class HandlerUpdateAbilityCreatedMovingPlatformNotify extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        var notify = UpdateAbilityCreatedMovingPlatformNotify.parseFrom(payload);
+        var entity = session.getPlayer().getScene().getEntityById(notify.getEntityId());
+
+        if (!(entity instanceof EntityGadget entityGadget) || !(entityGadget.getRouteConfig() instanceof AbilityRoute)) {
+            return;
+        }
+
+        switch (notify.getOpType()) {
+            case OP_TYPE_ACTIVATE -> entityGadget.startPlatform();
+            case OP_TYPE_DEACTIVATE -> entityGadget.stopPlatform();
+        }
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
-
-public class PacketChangeGameTimeRsp extends BasePacket {
-
-    public PacketChangeGameTimeRsp(Player player) {
-        super(PacketOpcodes.ChangeGameTimeRsp);
-
-        ChangeGameTimeRsp proto =
-                ChangeGameTimeRsp.newBuilder().setCurGameTime(player.getScene().getTime()).build();
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
+
+public class PacketChangeGameTimeRsp extends BasePacket {
+
+    public PacketChangeGameTimeRsp(Player player) {
+        super(PacketOpcodes.ChangeGameTimeRsp);
+
+        ChangeGameTimeRsp proto =
+                ChangeGameTimeRsp.newBuilder().setCurGameTime(player.getWorld().getGameTime()).build();
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketDungeonSettleNotify.java

@@ -1,64 +1,13 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
-import emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify;
-
-public class PacketDungeonSettleNotify extends BasePacket {
-
-    public PacketDungeonSettleNotify(WorldChallenge challenge) {
-        super(PacketOpcodes.DungeonSettleNotify);
-
-        DungeonSettleNotify proto =
-                DungeonSettleNotify.newBuilder()
-                        .setDungeonId(challenge.getScene().getDungeonData().getId())
-                        .setIsSuccess(challenge.isSuccess())
-                        .setCloseTime(challenge.getScene().getAutoCloseTime())
-                        .setResult(challenge.isSuccess() ? 1 : 0)
-                        .build();
-
-        this.setData(proto);
-    }
-
-    public PacketDungeonSettleNotify(
-            WorldChallenge challenge, boolean canJump, boolean hasNextLevel, int nextFloorId) {
-        super(PacketOpcodes.DungeonSettleNotify);
-
-        var continueStatus =
-                TowerLevelEndNotify.ContinueStateType.CONTINUE_STATE_TYPE_CAN_NOT_CONTINUE_VALUE;
-        if (challenge.isSuccess() && canJump) {
-            continueStatus =
-                    hasNextLevel
-                            ? TowerLevelEndNotify.ContinueStateType.CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL_VALUE
-                            : TowerLevelEndNotify.ContinueStateType
-                                    .CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR_VALUE;
-        }
-
-        var towerLevelEndNotify =
-                TowerLevelEndNotify.newBuilder()
-                        .setIsSuccess(challenge.isSuccess())
-                        .setContinueState(continueStatus)
-                        .addFinishedStarCondList(1)
-                        .addFinishedStarCondList(2)
-                        .addFinishedStarCondList(3)
-                        .addRewardItemList(
-                                ItemParamOuterClass.ItemParam.newBuilder().setItemId(201).setCount(1000).build());
-        if (nextFloorId > 0 && canJump) {
-            towerLevelEndNotify.setNextFloorId(nextFloorId);
-        }
-
-        DungeonSettleNotify proto =
-                DungeonSettleNotify.newBuilder()
-                        .setDungeonId(challenge.getScene().getDungeonData().getId())
-                        .setIsSuccess(challenge.isSuccess())
-                        .setCloseTime(challenge.getScene().getAutoCloseTime())
-                        .setResult(challenge.isSuccess() ? 1 : 0)
-                        .setTowerLevelEndNotify(towerLevelEndNotify.build())
-                        .build();
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.dungeons.dungeon_results.BaseDungeonResult;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+
+public class PacketDungeonSettleNotify extends BasePacket {
+    public PacketDungeonSettleNotify(BaseDungeonResult result) {
+        super(PacketOpcodes.DungeonSettleNotify);
+
+        this.setData(result.getProto());
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropUpdateNotify.java

@@ -1,22 +1,33 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify;
-
-public class PacketEntityFightPropUpdateNotify extends BasePacket {
-
-    public PacketEntityFightPropUpdateNotify(GameEntity entity, FightProperty prop) {
-        super(PacketOpcodes.EntityFightPropUpdateNotify);
-
-        EntityFightPropUpdateNotify proto =
-                EntityFightPropUpdateNotify.newBuilder()
-                        .setEntityId(entity.getId())
-                        .putFightPropMap(prop.getId(), entity.getFightProperty(prop))
-                        .build();
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify;
+
+import java.util.Collection;
+
+public class PacketEntityFightPropUpdateNotify extends BasePacket {
+    public PacketEntityFightPropUpdateNotify(GameEntity entity, FightProperty prop) {
+        super(PacketOpcodes.EntityFightPropUpdateNotify);
+
+        EntityFightPropUpdateNotify proto =
+                EntityFightPropUpdateNotify.newBuilder()
+                        .setEntityId(entity.getId())
+                        .putFightPropMap(prop.getId(), entity.getFightProperty(prop))
+                        .build();
+
+        this.setData(proto);
+    }
+
+    public PacketEntityFightPropUpdateNotify(GameEntity entity, Collection<FightProperty> props) {
+        super(PacketOpcodes.EntityFightPropUpdateNotify);
+
+        var protoBuilder = EntityFightPropUpdateNotify.newBuilder()
+            .setEntityId(entity.getId());
+        props.forEach(p -> protoBuilder.putFightPropMap(p.getId(), entity.getFightProperty(p)));
+
+        this.setData(protoBuilder);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java

@@ -1,26 +1,26 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.game.quest.enums.ParentQuestState;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify;
-
-public class PacketFinishedParentQuestNotify extends BasePacket {
-
-    public PacketFinishedParentQuestNotify(Player player) {
-        super(PacketOpcodes.FinishedParentQuestNotify, true);
-
-        FinishedParentQuestNotify.Builder proto = FinishedParentQuestNotify.newBuilder();
-
-        for (GameMainQuest mainQuest : player.getQuestManager().getMainQuests().values()) {
-            // Canceled Quests do not appear in this packet
-            if (mainQuest.getState() != ParentQuestState.PARENT_QUEST_STATE_CANCELED) {
-                proto.addParentQuestList(mainQuest.toProto());
-            }
-        }
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.enums.ParentQuestState;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify;
+
+public class PacketFinishedParentQuestNotify extends BasePacket {
+
+    public PacketFinishedParentQuestNotify(Player player) {
+        super(PacketOpcodes.FinishedParentQuestNotify, true);
+
+        FinishedParentQuestNotify.Builder proto = FinishedParentQuestNotify.newBuilder();
+
+        for (GameMainQuest mainQuest : player.getQuestManager().getMainQuests().values()) {
+            //Canceled Quests do not appear in this packet
+            if (mainQuest.getState() != ParentQuestState.PARENT_QUEST_STATE_CANCELED) {
+                proto.addParentQuestList(mainQuest.toProto(false));
+            }
+        }
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java

@@ -1,31 +1,33 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.quest.GameMainQuest;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify;
-import java.util.List;
-
-public class PacketFinishedParentQuestUpdateNotify extends BasePacket {
-
-    public PacketFinishedParentQuestUpdateNotify(GameMainQuest quest) {
-        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
-
-        FinishedParentQuestUpdateNotify proto =
-                FinishedParentQuestUpdateNotify.newBuilder().addParentQuestList(quest.toProto()).build();
-
-        this.setData(proto);
-    }
-
-    public PacketFinishedParentQuestUpdateNotify(List<GameMainQuest> quests) {
-        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
-
-        var proto = FinishedParentQuestUpdateNotify.newBuilder();
-
-        for (GameMainQuest mainQuest : quests) {
-            proto.addParentQuestList(mainQuest.toProto());
-        }
-        proto.build();
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify;
+
+import java.util.List;
+
+public class PacketFinishedParentQuestUpdateNotify extends BasePacket {
+
+    public PacketFinishedParentQuestUpdateNotify(GameMainQuest quest) {
+        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
+
+        FinishedParentQuestUpdateNotify proto = FinishedParentQuestUpdateNotify.newBuilder()
+            .addParentQuestList(quest.toProto(true))
+            .build();
+
+        this.setData(proto);
+    }
+
+    public PacketFinishedParentQuestUpdateNotify(List<GameMainQuest> quests) {
+        super(PacketOpcodes.FinishedParentQuestUpdateNotify);
+
+        var proto = FinishedParentQuestUpdateNotify.newBuilder();
+
+        for (GameMainQuest mainQuest : quests) {
+            proto.addParentQuestList(mainQuest.toProto(true));
+        }
+        proto.build();
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketHomeUnknown2Rsp.java

@@ -1,11 +1,11 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-
-public class PacketHomeUnknown2Rsp extends BasePacket {
-
-    public PacketHomeUnknown2Rsp() {
-        super(PacketOpcodes.Unk2700_KIIOGMKFNNP_ServerRsp);
-    }
-}
+//package emu.grasscutter.server.packet.send;
+//
+//import emu.grasscutter.net.packet.BasePacket;
+//import emu.grasscutter.net.packet.PacketOpcodes;
+//
+//public class PacketHomeUnknown2Rsp extends BasePacket {
+//
+//    public PacketHomeUnknown2Rsp() {
+//        super(PacketOpcodes.Unk2700_KIIOGMKFNNP_ServerRsp);
+//    }
+//}

src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameSettleRsp.java

@@ -1,18 +1,32 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.MusicGameSettleRspOuterClass;
-
-public class PacketMusicGameSettleRsp extends BasePacket {
-
-    public PacketMusicGameSettleRsp(int musicBasicId, long musicShareId, boolean isNewRecord) {
-        super(PacketOpcodes.MusicGameSettleRsp);
-
-        var proto = MusicGameSettleRspOuterClass.MusicGameSettleRsp.newBuilder();
-
-        proto.setMusicBasicId(musicBasicId).setUgcGuid(musicShareId).setIsNewRecord(isNewRecord);
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.MusicGameSettleReqOuterClass;
+import emu.grasscutter.net.proto.MusicGameSettleRspOuterClass;
+import emu.grasscutter.net.proto.RetcodeOuterClass;
+
+public class PacketMusicGameSettleRsp extends BasePacket {
+
+    public PacketMusicGameSettleRsp(int musicBasicId, long musicShareId, boolean isNewRecord) {
+        super(PacketOpcodes.MusicGameSettleRsp);
+
+        var proto = MusicGameSettleRspOuterClass.MusicGameSettleRsp.newBuilder();
+
+        proto.setMusicBasicId(musicBasicId).setUgcGuid(musicShareId).setIsNewRecord(isNewRecord);
+
+        this.setData(proto);
+    }
+
+    public PacketMusicGameSettleRsp(RetcodeOuterClass.Retcode errorCode, MusicGameSettleReqOuterClass.MusicGameSettleReq req) {
+        super(PacketOpcodes.MusicGameSettleRsp);
+
+        var proto = MusicGameSettleRspOuterClass.MusicGameSettleRsp.newBuilder()
+            .setRetcode(errorCode.getNumber())
+            .setMusicBasicId(req.getMusicBasicId())
+            .setUgcGuid(req.getUgcGuid());
+
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStartRouteNotify.java

@@ -1,22 +1,20 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.entity.platform.EntityPlatform;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass;
-
-public class PacketPlatformStartRouteNotify extends BasePacket {
-    public PacketPlatformStartRouteNotify(EntityPlatform entity, Scene scene) {
-        super(PacketOpcodes.PlatformStartRouteNotify);
-
-        var notify =
-                PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify.newBuilder()
-                        .setEntityId(entity.getId())
-                        .setSceneTime(scene.getSceneTime())
-                        .setPlatform(entity.onStartRoute())
-                        .build();
-
-        this.setData(notify);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify;
+import lombok.val;
+
+public class PacketPlatformStartRouteNotify extends BasePacket {
+    public PacketPlatformStartRouteNotify(EntityGadget gadgetEntity) {
+        super(PacketOpcodes.PlatformStartRouteNotify);
+
+        val notify = PlatformStartRouteNotify.newBuilder()
+            .setEntityId(gadgetEntity.getId())
+            .setSceneTime(gadgetEntity.getScene().getSceneTime())
+            .setPlatform(gadgetEntity.getPlatformInfo());
+
+        this.setData(notify);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketPlatformStopRouteNotify.java

@@ -1,22 +1,20 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.entity.platform.EntityPlatform;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PlatformStopRouteNotifyOuterClass;
-
-public class PacketPlatformStopRouteNotify extends BasePacket {
-    public PacketPlatformStopRouteNotify(EntityPlatform entity, Scene scene) {
-        super(PacketOpcodes.PlatformStopRouteNotify);
-
-        var notify =
-                PlatformStopRouteNotifyOuterClass.PlatformStopRouteNotify.newBuilder()
-                        .setPlatform(entity.onStopRoute())
-                        .setSceneTime(scene.getSceneTime())
-                        .setEntityId(entity.getId())
-                        .build();
-
-        this.setData(notify);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.PlatformStopRouteNotifyOuterClass;
+
+public class PacketPlatformStopRouteNotify extends BasePacket {
+    public PacketPlatformStopRouteNotify(EntityGadget gadgetEntity) {
+        super(PacketOpcodes.PlatformStopRouteNotify);
+
+        var notify = PlatformStopRouteNotifyOuterClass.PlatformStopRouteNotify.newBuilder()
+            .setPlatform(gadgetEntity.getPlatformInfo())
+            .setSceneTime(gadgetEntity.getScene().getSceneTime())
+            .setEntityId(gadgetEntity.getId())
+            .build();
+
+        this.setData(notify);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java

@@ -1,21 +1,21 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify;
-
-public class PacketPlayerGameTimeNotify extends BasePacket {
-
-    public PacketPlayerGameTimeNotify(Player player) {
-        super(PacketOpcodes.PlayerGameTimeNotify);
-
-        PlayerGameTimeNotify proto =
-                PlayerGameTimeNotify.newBuilder()
-                        .setGameTime(player.getScene().getTime())
-                        .setUid(player.getUid())
-                        .build();
-
-        this.setData(proto);
-    }
-}
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify;
+
+public class PacketPlayerGameTimeNotify extends BasePacket {
+
+    public PacketPlayerGameTimeNotify(Player player) {
+        super(PacketOpcodes.PlayerGameTimeNotify);
+
+        PlayerGameTimeNotify proto =
+                PlayerGameTimeNotify.newBuilder()
+                        .setGameTime(player.getWorld().getGameTime())
+                        .setUid(player.getUid())
+                        .build();
+
+        this.setData(proto);
+    }
+}