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>

src/main/java/emu/grasscutter/game/ability/Ability.java

@@ -1,45 +1,58 @@
 package emu.grasscutter.game.ability;
 
-import emu.grasscutter.data.binout.AbilityData;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.server.event.entity.EntityDamageEvent;
-import emu.grasscutter.utils.Utils;
 import java.util.HashMap;
 import java.util.Map;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.AbilityData;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.objects.Object2FloatMap;
+import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
 import lombok.Getter;
 
-public final class Ability {
+public class Ability {
     @Getter private AbilityData data;
     @Getter private GameEntity owner;
+    @Getter private Player playerOwner;
 
     @Getter private AbilityManager manager;
+
     @Getter private Map<String, AbilityModifierController> modifiers = new HashMap<>();
+    @Getter private Object2FloatMap<String> abilitySpecials = new Object2FloatOpenHashMap<>();
+
+    @Getter private static Map<String, Object2FloatMap<String>> abilitySpecialsModified = new HashMap<>();
 
     @Getter private int hash;
 
-    public Ability(AbilityData data, GameEntity owner) {
+    public Ability(AbilityData data, GameEntity owner, Player playerOwner) {
         this.data = data;
         this.owner = owner;
-        this.manager = owner.getScene().getWorld().getHost().getAbilityManager();
-        this.hash = Utils.abilityHash(data.abilityName);
+        this.manager = owner.getWorld().getHost().getAbilityManager();
+
+        if (this.data.abilitySpecials != null) {
+            for(var entry : this.data.abilitySpecials.entrySet())
+                abilitySpecials.put(entry.getKey(), entry.getValue().floatValue());
+        }
+
+        //if(abilitySpecialsModified.containsKey(this.data.abilityName)) {//Modify talent data
+        //    abilitySpecials.putAll(abilitySpecialsModified.get(this.data.abilityName));
+        //}
+
+        this.playerOwner = playerOwner;
+
+        hash = Utils.abilityHash(data.abilityName);
 
         data.initialize();
     }
 
-    public void onAdded() {
-        if (this.data.onAdded == null) return;
-        for (var action : data.onAdded) {
-            this.manager.executeAction(this, action);
-        }
-    }
+    public static String getAbilityName(AbilityString abString) {
+        if (abString.hasStr()) return abString.getStr();
+        if (abString.hasHash())
+            return GameData.getAbilityHashes().get(abString.getHash());
 
-    public void onRemoved() {
-        var tempModifiers = new HashMap<>(this.modifiers);
-        tempModifiers.values().forEach(AbilityModifierController::onRemoved);
-    }
-
-    public void onBeingHit(EntityDamageEvent event) {
-        var tempModifiers = new HashMap<>(this.modifiers);
-        tempModifiers.values().forEach(m -> m.onBeingHit(event));
+        return null;
     }
 }

src/main/java/emu/grasscutter/game/ability/AbilityActionHandler.java

@@ -1,7 +0,0 @@
-package emu.grasscutter.game.ability;
-
-import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-
-public abstract class AbilityActionHandler {
-    public abstract boolean execute(Ability ability, AbilityModifierAction action);
-}

src/main/java/emu/grasscutter/game/ability/AbilityLocalIdGenerator.java

@@ -1,59 +1,14 @@
 package emu.grasscutter.game.ability;
 
 import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.binout.AbilityMixinData;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 
-public final class AbilityLocalIdGenerator {
-    public ConfigAbilitySubContainerType type;
-    public long modifierIndex = 0;
-    public long configIndex = 0;
-    public long mixinIndex = 0;
-    private long actionIndex = 0;
-
-    public AbilityLocalIdGenerator(ConfigAbilitySubContainerType type) {
-        this.type = type;
-    }
-
-    public void initializeActionLocalIds(
-            AbilityModifierAction[] actions, Map<Integer, AbilityModifierAction> localIdToAction) {
-        if (actions == null) return;
-
-        actionIndex = 0;
-        for (var action : actions) {
-            actionIndex++;
-            long id = GetLocalId();
-            localIdToAction.put((int) id, action);
-        }
-
-        actionIndex = 0;
-    }
-
-    public long GetLocalId() {
-        switch (type) {
-            case ACTION -> {
-                return type.value + (configIndex << 3) + (actionIndex << 9);
-            }
-            case MIXIN -> {
-                return type.value + (mixinIndex << 3) + (configIndex << 9) + (actionIndex << 15);
-            }
-            case MODIFIER_ACTION -> {
-                return type.value + (modifierIndex << 3) + (configIndex << 9) + (actionIndex << 15);
-            }
-            case MODIFIER_MIXIN -> {
-                return type.value
-                        + (modifierIndex << 3)
-                        + (mixinIndex << 9)
-                        + (configIndex << 15)
-                        + (actionIndex << 21);
-            }
-            case NONE -> Grasscutter.getLogger().error("Ability local id generator using NONE type.");
-        }
-
-        return -1;
-    }
+import java.util.Map;
 
+@SuppressWarnings("ALL")
+public class AbilityLocalIdGenerator {
     @AllArgsConstructor
     public enum ConfigAbilitySubContainerType {
         NONE(0),
@@ -62,6 +17,65 @@ public final class AbilityLocalIdGenerator {
         MODIFIER_ACTION(3),
         MODIFIER_MIXIN(4);
 
-        public final long value;
+        final long value;
+    }
+
+    public ConfigAbilitySubContainerType type;
+    public long modifierIndex = 0;
+    public long configIndex = 0;
+    public long mixinIndex = 0;
+    private long actionIndex = 0;
+
+    public AbilityLocalIdGenerator(ConfigAbilitySubContainerType type)
+    {
+        this.type = type;
+    }
+
+    public void initializeActionLocalIds(AbilityModifierAction[] actions, Map<Integer, AbilityModifierAction> localIdToAction)
+    {
+        if (actions == null) return;
+        actionIndex = 0;
+        for (AbilityModifierAction action : actions) {
+            actionIndex++;
+            long id = GetLocalId();
+            localIdToAction.put((int) id, action);
+        }
+
+        actionIndex = 0;
+    }
+
+    public void initializeMixinsLocalIds(AbilityMixinData[] mixins, Map<Integer, AbilityMixinData> localIdToAction)
+    {
+        if (mixins == null) return;
+        mixinIndex = 0;
+        for (AbilityMixinData mixin : mixins) {
+            long id = GetLocalId();
+            localIdToAction.put((int) id, mixin);
+
+            mixinIndex++;
+        }
+
+        mixinIndex = 0;
+    }
+
+    public long GetLocalId()
+    {
+        switch (type) {
+            case ACTION -> {
+                return (long) type.value + (configIndex << 3) + (actionIndex << 9);
+            }
+            case MIXIN -> {
+                return (long) type.value + (mixinIndex << 3) + (configIndex << 9) + (actionIndex << 15);
+            }
+            case MODIFIER_ACTION -> {
+                return (long) type.value + (modifierIndex << 3) + (configIndex << 9) + (actionIndex << 15);
+            }
+            case MODIFIER_MIXIN -> {
+                return (long) type.value + (modifierIndex << 3) + (mixinIndex << 9) + (configIndex << 15) + (actionIndex << 21);
+            }
+            case NONE -> Grasscutter.getLogger().error("Ability local id generator using NONE type.");
+        }
+
+        return -1;
     }
 }

src/main/java/emu/grasscutter/game/ability/AbilityManager.java

@@ -1,70 +1,62 @@
 package emu.grasscutter.game.ability;
 
+import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.AbilityData;
+import emu.grasscutter.data.binout.AbilityMixinData;
+import emu.grasscutter.data.binout.AbilityModifier;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import emu.grasscutter.data.binout.AbilityModifierEntry;
-import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.ability.actions.AbilityAction;
+import emu.grasscutter.game.ability.actions.AbilityActionHandler;
+import emu.grasscutter.game.ability.mixins.AbilityMixin;
+import emu.grasscutter.game.ability.mixins.AbilityMixinHandler;
 import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.entity.gadget.GadgetGatherObject;
 import emu.grasscutter.game.player.BasePlayerManager;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.enums.QuestContent;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddAbility;
 import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange;
-import emu.grasscutter.net.proto.AbilityMetaModifierDurabilityChangeOuterClass.AbilityMetaModifierDurabilityChange;
 import emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap;
-import emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina;
+import emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType;
 import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
 import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
 import io.netty.util.concurrent.FastThreadLocalThread;
+import lombok.Getter;
+import org.reflections.Reflections;
+
 import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import lombok.Getter;
-import org.reflections.Reflections;
 
 public final class AbilityManager extends BasePlayerManager {
+
+    private final static HashMap<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers = new HashMap<>();
+    private final static HashMap<AbilityMixinData.Type, AbilityMixinHandler> mixinHandlers = new HashMap<>();
+
     public static final ExecutorService eventExecutor;
-
     static {
-        eventExecutor =
-                new ThreadPoolExecutor(
-                        4,
-                        4,
-                        60,
-                        TimeUnit.SECONDS,
-                        new LinkedBlockingDeque<>(1000),
-                        FastThreadLocalThread::new,
-                        new ThreadPoolExecutor.AbortPolicy());
-    }
+        eventExecutor = new ThreadPoolExecutor(4, 4,
+            60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(1000),
+            FastThreadLocalThread::new, new ThreadPoolExecutor.AbortPolicy());
 
-    private final HealAbilityManager healAbilityManager;
-    private final Map<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers;
+        registerHandlers();
+    }
 
     @Getter private boolean abilityInvulnerable = false;
 
     public AbilityManager(Player player) {
         super(player);
-
-        this.healAbilityManager = new HealAbilityManager(player);
-        this.actionHandlers = new HashMap<>();
-
-        this.registerHandlers();
     }
 
-    /** Registers all present ability handlers. */
-    private void registerHandlers() {
-        var reflections = new Reflections("emu.grasscutter.game.ability.actions");
-        var handlerClasses = reflections.getSubTypesOf(AbilityActionHandler.class);
+    public static void registerHandlers() {
+        Reflections reflections = new Reflections("emu.grasscutter.game.ability.actions");
+        var handlerClassesAction = reflections.getSubTypesOf(AbilityActionHandler.class);
 
-        for (var obj : handlerClasses) {
+        for (var obj : handlerClassesAction) {
             try {
                 if (obj.isAnnotationPresent(AbilityAction.class)) {
                     AbilityModifierAction.Type abilityAction = obj.getAnnotation(AbilityAction.class).value();
@@ -76,37 +68,74 @@ public final class AbilityManager extends BasePlayerManager {
                 Grasscutter.getLogger().error("Unable to register handler.", e);
             }
         }
+
+        reflections = new Reflections("emu.grasscutter.game.ability.mixins");
+        var handlerClassesMixin = reflections.getSubTypesOf(AbilityMixinHandler.class);
+
+        for (var obj : handlerClassesMixin) {
+            try {
+                if (obj.isAnnotationPresent(AbilityAction.class)) {
+                    AbilityMixinData.Type abilityMixin = obj.getAnnotation(AbilityMixin.class).value();
+                    mixinHandlers.put(abilityMixin, obj.getDeclaredConstructor().newInstance());
+                } else {
+                    return;
+                }
+            } catch (Exception e) {
+                Grasscutter.getLogger().error("Unable to register handler.", e);
+            }
+        }
     }
 
-    public void executeAction(Ability ability, AbilityModifierAction action) {
-        var handler = actionHandlers.get(action.type);
+    public void executeAction(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        AbilityActionHandler handler = actionHandlers.get(action.type);
 
         if (handler == null || ability == null) {
-            Grasscutter.getLogger()
-                    .trace("Could not execute ability action {} at {}", action.type, ability);
+            Grasscutter.getLogger().debug("Could not execute ability action {} at {}", action.type, ability);
             return;
         }
 
-        eventExecutor.submit(
-                () -> {
-                    if (!handler.execute(ability, action)) {
-                        Grasscutter.getLogger()
-                                .debug("exec ability action failed {} at {}", action.type, ability);
-                    }
-                });
+        eventExecutor.submit(() -> {
+            if (!handler.execute(ability, action, abilityData, target)) {
+                Grasscutter.getLogger().debug("Execute ability action failed {} at {}", action.type, ability);
+            }
+        });
+    }
+
+    public void executeMixin(Ability ability, AbilityMixinData mixinData, ByteString abilityData) {
+        AbilityMixinHandler handler = mixinHandlers.get(mixinData.type);
+
+        if (handler == null || ability == null || mixinData == null) {
+            Grasscutter.getLogger().error("Could not execute ability mixin {} at {}", mixinData.type, ability);
+            return;
+        }
+
+        eventExecutor.submit(() -> {
+            if (!handler.execute(ability, mixinData, abilityData)) {
+                Grasscutter.getLogger().error("exec ability action failed {} at {}", mixinData.type, ability);
+            }
+        });
     }
 
     public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
-        this.healAbilityManager.healHandler(invoke);
+        Grasscutter.getLogger().trace("Ability invoke: " + invoke + " " + invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + this.player.getScene().getEntityById(invoke.getEntityId()));
+        var entity = this.player.getScene().getEntityById(invoke.getEntityId());
+        if (entity != null) {
+            Grasscutter.getLogger().trace("Entity {} has a group of {} and a config of {}.",
+                invoke.getEntityId(), entity.getGroupId(), entity.getConfigId());
 
-        if (invoke.getEntityId() == 67109298) {
-            Grasscutter.getLogger()
-                    .info(
-                            invoke.getArgumentType()
-                                    + " ("
-                                    + invoke.getArgumentTypeValue()
-                                    + "): "
-                                    + invoke.getEntityId());
+            Grasscutter.getLogger().trace("Invoke type of {} ({}) has entity {}.",
+                invoke.getArgumentType(), invoke.getArgumentTypeValue(), entity.getId());
+        } else {
+            Grasscutter.getLogger().debug("Invoke type of {} ({}) has no entity. (referring to {})",
+                invoke.getArgumentType(), invoke.getArgumentTypeValue(), invoke.getEntityId());
+        }
+
+        if (invoke.getHead().getTargetId() != 0) {
+            Grasscutter.getLogger().trace("Target: " + this.player.getScene().getEntityById(invoke.getHead().getTargetId()));
+        }
+        if (invoke.getHead().getLocalId() != 0) {
+            this.handleServerInvoke(invoke);
+            return;
         }
 
         switch (invoke.getArgumentType()) {
@@ -116,17 +145,63 @@ public final class AbilityManager extends BasePlayerManager {
             case ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA -> this.handleMixinCostStamina(invoke);
             case ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL -> this.handleGenerateElemBall(invoke);
             case ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE -> this.handleGlobalFloatValue(invoke);
-            case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE -> this
-                    .handleModifierDurabilityChange(invoke);
+            case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE -> this.handleModifierDurabilityChange(invoke);
             case ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY -> this.handleAddNewAbility(invoke);
-            case ABILITY_INVOKE_ARGUMENT_NONE -> this.handleInvoke(invoke);
             default -> {}
         }
     }
 
+    public void handleServerInvoke(AbilityInvokeEntry invoke) {
+        var head = invoke.getHead();
+
+        var entity = this.player.getScene().getEntityById(invoke.getEntityId());
+        if (entity == null) {
+            Grasscutter.getLogger().trace("Entity not found: {}", invoke.getEntityId());
+            return;
+        }
+
+        var target = this.player.getScene().getEntityById(head.getTargetId());
+        if(target == null) target = entity;
+
+        Ability ability = null;
+
+        // Seems that target is used, but need to be sure, TODO: Research
+
+        // Find ability or modifier's ability
+        if (head.getInstancedModifierId() != 0 && entity.getInstancedModifiers().containsKey(head.getInstancedModifierId())) {
+            ability = entity.getInstancedModifiers().get(head.getInstancedModifierId()).getAbility();
+        }
+
+        if (ability == null && head.getInstancedAbilityId() != 0 && (head.getInstancedAbilityId() - 1) < entity.getInstancedAbilities().size()) {
+            ability = entity.getInstancedAbilities().get(head.getInstancedAbilityId() - 1);
+        }
+
+        if (ability == null) {
+            Grasscutter.getLogger().trace("Ability not found: ability {} modifier {}", head.getInstancedAbilityId(), head.getInstancedModifierId());
+            return;
+        }
+
+        //Time to reach the handlers
+        var action = ability.getData().localIdToAction.get(head.getLocalId());
+        if (action != null) {
+            //Executing action
+            this.executeAction(ability, action, invoke.getAbilityData(), target);
+            return;
+        } else {
+            var mixin = ability.getData().localIdToMixin.get(head.getLocalId());
+
+            if(mixin != null) {
+                executeMixin(ability, mixin, invoke.getAbilityData());
+
+                return;
+            }
+        }
+
+        Grasscutter.getLogger().trace("Action or mixin not found: local_id {} ability {} actions to ids {}", head.getLocalId(), ability.getData().abilityName, ability.getData().localIdToAction.toString());
+    }
+
     /**
      * Invoked when a player starts a skill.
-     *
      * @param player The player who started the skill.
      * @param skillId The skill ID.
      * @param casterId The caster ID.
@@ -158,7 +233,6 @@ public final class AbilityManager extends BasePlayerManager {
 
     /**
      * Invoked when a player ends a skill.
-     *
      * @param player The player who started the skill.
      */
     public void onSkillEnd(Player player) {
@@ -176,293 +250,228 @@ public final class AbilityManager extends BasePlayerManager {
         this.abilityInvulnerable = false;
     }
 
-    /**
-     * Handles an ability invoke.
-     *
-     * @param invoke The invocation.
-     */
-    private void handleInvoke(AbilityInvokeEntry invoke) {
-        var entity = this.player.getScene().getEntityById(invoke.getEntityId());
-        if (entity == null) {
-            return;
-        }
-
-        var head = invoke.getHead();
-        Grasscutter.getLogger()
-                .trace(
-                        "{} {} {}",
-                        head.getInstancedAbilityId(),
-                        entity.getInstanceToHash(),
-                        head.getLocalId());
-
-        var hash = entity.getInstanceToHash().get(head.getInstancedAbilityId());
-        if (hash == null) {
-            var abilities = entity.getAbilities().values().toArray(new Ability[0]);
-
-            if (head.getInstancedAbilityId() <= abilities.length) {
-                var ability = abilities[head.getInstancedAbilityId() - 1];
-                Grasscutter.getLogger().trace("-> {}", ability.getData().localIdToAction);
-                var action = ability.getData().localIdToAction.get(head.getLocalId());
-                if (action != null) ability.getManager().executeAction(ability, action);
-            }
+    private void setAbilityOverrideValue(Ability ability, AbilityScalarValueEntry valueChange) {
+        if(valueChange.getValueType() != AbilityScalarType.ABILITY_SCALAR_TYPE_FLOAT) {
+            Grasscutter.getLogger().trace("Scalar type not supported: {}", valueChange.getValueType());
 
             return;
         }
 
-        var stream =
-                entity.getAbilities().values().stream()
-                        .filter(
-                                a ->
-                                        a.getHash() == hash
-                                                || a.getData().abilityName
-                                                        == entity.getInstanceToName().get(head.getInstancedAbilityId()));
-        stream.forEach(
-                ability -> {
-                    var action = ability.getData().localIdToAction.get(head.getLocalId());
-                    if (action != null) ability.getManager().executeAction(ability, action);
-                });
+        if(!valueChange.getKey().hasStr()) {
+            Grasscutter.getLogger().trace("TODO: Calculate all the ability value hashes");
+
+            return;
+        }
+
+        ability.getAbilitySpecials().put(valueChange.getKey().getStr(), valueChange.getFloatValue());
+        Grasscutter.getLogger().trace("Ability {} changed {} to {}", ability.getData().abilityName, valueChange.getKey().getStr(), valueChange.getFloatValue());
     }
 
     private void handleOverrideParam(AbilityInvokeEntry invoke) throws Exception {
         var entity = this.player.getScene().getEntityById(invoke.getEntityId());
+        var head = invoke.getHead();
 
-        if (entity == null) {
+        if(entity == null) {
+            Grasscutter.getLogger().trace("Entity not found: {}", invoke.getEntityId());
             return;
         }
 
-        var entry = AbilityScalarValueEntry.parseFrom(invoke.getAbilityData());
-        entity.getMetaOverrideMap().put(entry.getKey().getStr(), entry.getFloatValue());
+        var instancedAbilityIndex = head.getInstancedAbilityId() - 1;
+        if(instancedAbilityIndex >= entity.getInstancedAbilities().size()) {
+            Grasscutter.getLogger().error("Ability not found {}", head.getInstancedAbilityId());
+            return;
+        }
+
+        var valueChange = AbilityScalarValueEntry.parseFrom(invoke.getAbilityData());
+
+        var ability = entity.getInstancedAbilities().get(instancedAbilityIndex);
+        setAbilityOverrideValue(ability, valueChange);
     }
 
     private void handleReinitOverrideMap(AbilityInvokeEntry invoke) throws Exception {
         var entity = this.player.getScene().getEntityById(invoke.getEntityId());
+        var head = invoke.getHead();
 
-        if (entity == null) {
+        if(entity == null) {
+            Grasscutter.getLogger().trace("Entity not found: {}", invoke.getEntityId());
             return;
         }
 
-        var map = AbilityMetaReInitOverrideMap.parseFrom(invoke.getAbilityData());
-        for (var entry : map.getOverrideMapList()) {
-            entity.getMetaOverrideMap().put(entry.getKey().getStr(), entry.getFloatValue());
+        var instancedAbilityIndex = head.getInstancedAbilityId() - 1;
+        if(instancedAbilityIndex >= entity.getInstancedAbilities().size()) {
+            Grasscutter.getLogger().error("Ability not found {}", head.getInstancedAbilityId());
+            return;
+        }
+
+        var ability = entity.getInstancedAbilities().get(instancedAbilityIndex);
+        var valueChanges = AbilityMetaReInitOverrideMap.parseFrom(invoke.getAbilityData());
+        for (var variableChange : valueChanges.getOverrideMapList()) {
+            setAbilityOverrideValue(ability, variableChange);
         }
     }
 
     private void handleModifierChange(AbilityInvokeEntry invoke) throws Exception {
-        // Sanity checks
-        var target = this.player.getScene().getEntityById(invoke.getEntityId());
-        if (target == null) {
-            return;
-        }
-
-        var data = AbilityMetaModifierChange.parseFrom(invoke.getAbilityData());
-        if (data == null) {
-            return;
-        }
-
-        // Destroying rocks
-        if (target instanceof EntityGadget targetGadget
-                && targetGadget.getContent() instanceof GadgetGatherObject gatherObject) {
-            if (data.getAction() == ModifierAction.MODIFIER_ACTION_REMOVED) {
-                gatherObject.dropItems(this.getPlayer());
-                return;
-            }
-        }
-
-        // Sanity checks
+        //TODO:
+        var modChange = AbilityMetaModifierChange.parseFrom(invoke.getAbilityData());
         var head = invoke.getHead();
 
-        if (data.getAction() == ModifierAction.MODIFIER_ACTION_REMOVED) {
-            var ability = target.getAbilities().get(data.getParentAbilityName().getStr());
-            if (ability != null) {
-                var modifier = ability.getModifiers().get(head.getInstancedModifierId());
-                if (modifier != null) {
-                    modifier.onRemoved();
-                    ability.getModifiers().remove(modifier);
-                }
-            }
-        }
+        if (head.getInstancedAbilityId() == 0 ||
+            head.getInstancedModifierId() > 2000) return; // Error: TODO: display error
 
-        if (data.getAction() == ModifierAction.MODIFIER_ACTION_ADDED) {
-            var modifierString = data.getParentAbilityName().getStr();
-            var hash = target.getInstanceToHash().get(head.getInstancedAbilityId());
-            if (hash == null) return;
-
-            target.getAbilities().values().stream()
-                    .filter(
-                            a ->
-                                    a.getHash() == hash
-                                            || a.getData().abilityName
-                                                    == target.getInstanceToName().get(head.getInstancedAbilityId()))
-                    .forEach(
-                            a -> {
-                                a.getModifiers().keySet().stream()
-                                        .filter(key -> key.compareTo(modifierString) == 0)
-                                        .forEach(
-                                                key -> {
-                                                    a.getModifiers().get(key).setLocalId(head.getInstancedModifierId());
-                                                });
-                            });
-        }
-
-        var sourceEntity = this.player.getScene().getEntityById(data.getApplyEntityId());
-        if (sourceEntity == null) {
+        if (head.getIsServerbuffModifier()) {
+            //TODO
+            Grasscutter.getLogger().trace("TODO: Handle serverbuff modifier");
             return;
         }
 
-        // This is not how it works but we will keep it for now since healing abilities dont work
-        // properly anyways
-        if (data.getAction() == ModifierAction.MODIFIER_ACTION_ADDED
-                && data.getParentAbilityName() != null) {
-            // Handle add modifier here
-            String modifierString = data.getParentAbilityName().getStr();
-            AbilityModifierEntry modifier = GameData.getAbilityModifiers().get(modifierString);
+        var entity = this.player.getScene().getEntityById(invoke.getEntityId());
+        if (entity == null) {
+            Grasscutter.getLogger().debug("Entity not found: {}", invoke.getEntityId());
+            return;
+        }
 
-            if (modifier != null && modifier.getOnAdded().size() > 0) {
-                for (AbilityModifierAction action : modifier.getOnAdded()) {
-                    this.invokeAction(action, target, sourceEntity);
-                }
-            }
+        if (modChange.getAction() == ModifierAction.MODIFIER_ACTION_ADDED) {
+            AbilityData instancedAbilityData = null;
+            Ability instancedAbility = null;
 
-            // Add to meta modifier list
-            target.getMetaModifiers().put(head.getInstancedModifierId(), modifierString);
-        } else if (data.getAction() == ModifierAction.MODIFIER_ACTION_REMOVED) {
-            // Handle remove modifier
-            String modifierString = target.getMetaModifiers().get(head.getInstancedModifierId());
-
-            if (modifierString != null) {
-                // Get modifier and call on remove event
-                AbilityModifierEntry modifier = GameData.getAbilityModifiers().get(modifierString);
-
-                if (modifier != null && modifier.getOnRemoved().size() > 0) {
-                    for (AbilityModifierAction action : modifier.getOnRemoved()) {
-                        this.invokeAction(action, target, sourceEntity);
+            if (head.getTargetId() != 0) {
+                //Get ability from target entity
+                var targetEntity = this.player.getScene().getEntityById(head.getTargetId());
+                if (targetEntity != null) {
+                    if ((head.getInstancedAbilityId() - 1) < targetEntity.getInstancedAbilities().size()) {
+                        instancedAbility = targetEntity.getInstancedAbilities().get(head.getInstancedAbilityId() - 1);
+                        if (instancedAbility != null) instancedAbilityData = instancedAbility.getData();
                     }
                 }
-
-                // Remove from meta modifiers
-                target.getMetaModifiers().remove(head.getInstancedModifierId());
             }
+
+            if (instancedAbilityData == null) {
+                //search on entity base id
+                if (entity != null) {
+                    if ((head.getInstancedAbilityId() - 1) < entity.getInstancedAbilities().size()) {
+                        instancedAbility = entity.getInstancedAbilities().get(head.getInstancedAbilityId() - 1);
+                        if (instancedAbility != null) instancedAbilityData = instancedAbility.getData();
+                    }
+                }
+            }
+
+            if (instancedAbilityData == null) {
+                //Search for the parent ability
+
+                //TODO: Research about hash
+                instancedAbilityData = GameData.getAbilityData(modChange.getParentAbilityName().getStr());
+            }
+
+            if (instancedAbilityData == null) {
+                Grasscutter.getLogger().trace("No ability found");
+                return; //TODO: Display error message
+            }
+
+            var modifierArray = instancedAbilityData.modifiers.values().toArray();
+            if (modChange.getModifierLocalId() >= modifierArray.length) {
+                Grasscutter.getLogger().trace("Modifier local id {} not found", modChange.getModifierLocalId());
+                return;
+            }
+
+            var modifierData = (AbilityModifier)modifierArray[modChange.getModifierLocalId()];
+            if (entity.getInstancedModifiers().containsKey(head.getInstancedModifierId())) {
+                Grasscutter.getLogger().trace("Replacing entity {} modifier id {} with ability {} modifier {}", invoke.getEntityId(), head.getInstancedModifierId(), instancedAbilityData.abilityName, modifierData);
+            } else {
+                Grasscutter.getLogger().trace("Adding entity {} modifier id {} with ability {} modifier {}", invoke.getEntityId(), head.getInstancedModifierId(), instancedAbilityData.abilityName, modifierData);
+            }
+
+            AbilityModifierController modifier = new AbilityModifierController(instancedAbility, instancedAbilityData, modifierData);
+
+            entity.getInstancedModifiers().put(head.getInstancedModifierId(), modifier);
+
+            //TODO: Add all the ability modifier property change
+        } else if(modChange.getAction() == ModifierAction.MODIFIER_ACTION_REMOVED) {
+            Grasscutter.getLogger().trace("Removed on entity {} modifier id {}: {}", invoke.getEntityId(), head.getInstancedModifierId(), entity.getInstancedModifiers().get(head.getInstancedModifierId()));
+
+            //TODO: Add debug log
+
+            entity.getInstancedModifiers().remove(head.getInstancedModifierId());
+        } else {
+            //TODO: Display error message
+            Grasscutter.getLogger().debug("Unknown action");
         }
     }
 
-    private void handleMixinCostStamina(AbilityInvokeEntry invoke)
-            throws InvalidProtocolBufferException {
-        AbilityMixinCostStamina costStamina =
-                AbilityMixinCostStamina.parseFrom((invoke.getAbilityData()));
-        this.getPlayer().getStaminaManager().handleMixinCostStamina(costStamina.getIsSwim());
+    private void handleMixinCostStamina(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
+
     }
 
-    private void handleGenerateElemBall(AbilityInvokeEntry invoke)
-            throws InvalidProtocolBufferException {
-        this.player.getEnergyManager().handleGenerateElemBall(invoke);
+    private void handleGenerateElemBall(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
+
     }
 
-    /**
-     * Handles a float value ability entry.
-     *
-     * @param invoke The ability invoke entry.
-     */
-    private void handleGlobalFloatValue(AbilityInvokeEntry invoke)
-            throws InvalidProtocolBufferException {
+    private void handleGlobalFloatValue(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
+        var entity = this.player.getScene().getEntityById(invoke.getEntityId());
+        if(entity == null) return;
+
         var entry = AbilityScalarValueEntry.parseFrom(invoke.getAbilityData());
-        if (entry.getKey().hasStr()
-                && entry.hasFloatValue()
-                && entry.getFloatValue() == 2.0f
-                && entry.getKey().getStr().equals("_ABILITY_UziExplode_Count")) {
-            player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_SKILL, 10006);
+        if(entry == null || !entry.hasFloatValue()) return;
+
+        String key = null;
+        if(entry.getKey().hasStr())
+            key = entry.getKey().getStr();
+        else if(entry.getKey().hasHash())
+            key = GameData.getAbilityHashes().get(entry.getKey().getHash());
+
+        if(key == null) return;
+
+        if(key.startsWith("SGV_")) return; //Server does not allow to change this variables I think
+        switch(entry.getValueType().getNumber()) {
+            case AbilityScalarType.ABILITY_SCALAR_TYPE_FLOAT_VALUE:
+                if(!Float.isNaN(entry.getFloatValue())) entity.getGlobalAbilityValues().put(key, entry.getFloatValue());
+                break;
+            case AbilityScalarType.ABILITY_SCALAR_TYPE_UINT_VALUE:
+                entity.getGlobalAbilityValues().put(key, (float)entry.getUintValue());
+                break;
+            default:
+                return;
         }
     }
 
-    private void invokeAction(
-            AbilityModifierAction action, GameEntity target, GameEntity sourceEntity) {
-        switch (action.type) {
-            case HealHP -> {}
-            case LoseHP -> {
-                if (action.amountByTargetCurrentHPRatio == null) {
-                    return;
-                }
+    private void invokeAction(AbilityModifierAction action, GameEntity target, GameEntity sourceEntity) {
 
-                float damageAmount = action.amount.get();
-
-                // if (action.amount.isDynamic && action.amount.dynamicKey != null) {
-                //     damageAmount =
-                // sourceEntity.getMetaOverrideMap().getOrDefault(action.amount.dynamicKey, 0f);
-                // }
-
-                if (damageAmount > 0) {
-                    target.damage(damageAmount);
-                }
-            }
-            default -> {}
-        }
     }
 
-    private void handleModifierDurabilityChange(AbilityInvokeEntry invoke)
-            throws InvalidProtocolBufferException {
-        var target = this.player.getScene().getEntityById(invoke.getEntityId());
-        if (target == null) {
-            return;
-        }
+    private void handleModifierDurabilityChange(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
 
-        var data = AbilityMetaModifierDurabilityChange.parseFrom(invoke.getAbilityData());
-        if (data == null) {
-            return;
-        }
-
-        var head = invoke.getHead();
-        var hash = target.getInstanceToHash().get(head.getInstancedAbilityId());
-        if (hash == null) return;
-        target.getAbilities().values().stream()
-                .filter(
-                        a ->
-                                a.getHash() == hash
-                                        || a.getData().abilityName
-                                                == target.getInstanceToName().get(head.getInstancedAbilityId()))
-                .forEach(
-                        a -> {
-                            a.getModifiers().values().stream()
-                                    .filter(m -> m.getLocalId() == head.getInstancedModifierId())
-                                    .forEach(
-                                            modifier -> {
-                                                modifier.setElementDurability(data.getRemainDurability());
-                                            });
-                        });
     }
 
-    private void handleAddNewAbility(AbilityInvokeEntry invoke)
-            throws InvalidProtocolBufferException {
-        var data = AbilityMetaAddAbility.parseFrom(invoke.getAbilityData());
-        if (data == null) {
+    private void handleAddNewAbility(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
+        var entity = this.player.getScene().getEntityById(invoke.getEntityId());
+
+        if(entity == null) {
+            Grasscutter.getLogger().trace("Entity not found: {}", invoke.getEntityId());
             return;
         }
 
-        var ability = data.getAbility();
-        var abilityName = ability.getAbilityName();
-        if (abilityName.getHash() != 0)
-            Grasscutter.getLogger()
-                    .trace("Instancing {} in to {}", abilityName.getHash(), ability.getInstancedAbilityId());
-        else
-            Grasscutter.getLogger()
-                    .trace("Instancing {} in to {}", abilityName.getStr(), ability.getInstancedAbilityId());
+        var addAbility = AbilityMetaAddAbility.parseFrom(invoke.getAbilityData());
 
-        var target = this.player.getScene().getEntityById(invoke.getEntityId());
-        if (target == null) {
+        var abilityName = Ability.getAbilityName(addAbility.getAbility().getAbilityName());
+
+        var ability = GameData.getAbilityData(abilityName);
+        if(ability == null) {
+            Grasscutter.getLogger().trace("Ability not found: {}", abilityName);
             return;
         }
 
-        target.getInstanceToHash().put(ability.getInstancedAbilityId(), abilityName.getHash());
-        target.getInstanceToName().put(ability.getInstancedAbilityId(), abilityName.getStr());
+        entity.getInstancedAbilities().add(new Ability(ability, entity, player));
+
+        Grasscutter.getLogger().trace("Ability added to entity {} at index {}", entity.getId(), entity.getInstancedAbilities().size());
     }
 
     public void addAbilityToEntity(GameEntity entity, String name) {
-        var data = GameData.getAbilityData(name);
-        if (data != null) addAbilityToEntity(entity, data, name);
+        AbilityData data = GameData.getAbilityData(name);
+        if(data != null)
+            addAbilityToEntity(entity, data);
     }
 
-    public void addAbilityToEntity(GameEntity entity, AbilityData abilityData, String id) {
-        var ability = new Ability(abilityData, entity);
-        entity.getAbilities().put(id, ability);
-
-        ability.onAdded();
+    public void addAbilityToEntity(GameEntity entity, AbilityData abilityData) {
+        Ability ability = new Ability(abilityData, entity, this.player);
+        entity.getInstancedAbilities().add(ability); //This are in order
     }
 }

src/main/java/emu/grasscutter/game/ability/AbilityModifierController.java

@@ -1,63 +1,18 @@
 package emu.grasscutter.game.ability;
 
+import emu.grasscutter.data.binout.AbilityData;
 import emu.grasscutter.data.binout.AbilityModifier;
-import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import emu.grasscutter.server.event.entity.EntityDamageEvent;
 import lombok.Getter;
-import lombok.Setter;
 
-public final class AbilityModifierController {
-    @Getter private AbilityModifier data;
+public class AbilityModifierController {
+    @Getter private Ability ability;
 
-    @Getter private Ability ability; // Owner ability instance
+    @Getter private AbilityData abilityData;
+    @Getter private AbilityModifier modifierData;
 
-    @Getter private float elementDurability;
-
-    @Getter @Setter private int localId;
-
-    public AbilityModifierController(Ability ability, AbilityModifier data) {
+    public AbilityModifierController(Ability ability, AbilityData abilityData, AbilityModifier modifierData) {
         this.ability = ability;
-        this.data = data;
-        this.elementDurability = data.elementDurability.get();
-    }
-
-    public void setElementDurability(float durability) {
-        this.elementDurability = durability;
-
-        if (durability <= 0) {
-            onRemoved();
-            ability.getModifiers().values().removeIf(a -> a == this);
-        }
-    }
-
-    public void onAdded() {
-        if (data.onAdded == null) return;
-
-        for (AbilityModifierAction action : data.onAdded) {
-            ability.getManager().executeAction(ability, action);
-        }
-    }
-
-    public void onRemoved() {
-        if (data.onRemoved == null) return;
-
-        for (AbilityModifierAction action : data.onRemoved) {
-            ability.getManager().executeAction(ability, action);
-        }
-    }
-
-    public void onBeingHit(EntityDamageEvent event) {
-        if (data.onBeingHit != null)
-            for (var action : data.onBeingHit) {
-                ability.getManager().executeAction(ability, action);
-            }
-
-        if (event.getAttackElementType().equals(data.elementType)) {
-            elementDurability -= event.getDamage();
-            if (elementDurability <= 0) {
-                onRemoved();
-                ability.getModifiers().values().removeIf(a -> a == this);
-            }
-        }
+        this.abilityData = abilityData;
+        this.modifierData = modifierData;
     }
 }

src/main/java/emu/grasscutter/game/ability/HealAbilityManager.java

@@ -1,214 +0,0 @@
-package emu.grasscutter.game.ability;
-
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.FightProperty;
-import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
-import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class HealAbilityManager {
-    ArrayList<HealDataAvatar> healDataAvatarList;
-    private Player player;
-
-    public HealAbilityManager(Player player) {
-        this.player = player;
-        healDataAvatarList = new ArrayList();
-        healDataAvatarList.add(
-                new HealDataAvatar(10000054, "Kokomi", 0)
-                        .addHealData(
-                                "E",
-                                "ElementalArt_Heal_MaxHP_Base_Percentage",
-                                "ElementalArt_Heal_Base_Amount",
-                                false)
-                        .addHealData("Q", "Avatar_Kokomi_ElementalBurst_Heal", 0.0172f, 212f, false));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000003, "Qin", 1).addHealData("Q", "Heal", "BurstHealConst", true));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000034, "Noel", 2)
-                        .addHealData("E", "OnAttack_HealthRate", 0.452f, 282f, true));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000032, "Bennett", 0)
-                        .addHealData("Q", "HealMaxHpRatio", "HealConst", false));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000039, "Diona", 0)
-                        .addHealData("Q", "HealHPRatio", "HealHP_Const", false));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000053, "Sayu", 1)
-                        .addHealData("Q", "Constellation_6_Damage", "Heal_BaseAmount", true)
-                        .addHealData("Q", "Heal_AttackRatio", "Constellation_6_Heal", true));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000014, "Barbara", 0)
-                        .addHealData("E", "HealHPOnAdded", "HealHPOnAdded_Const", true)
-                        .addHealData("E", "HealHP_OnHittingOthers", "HealHP_Const_OnHittingOthers", true)
-                        .addHealData("Q", "Avatar_Barbara_IdolHeal", 0.374f, 4660f, true));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000065, "Shinobu", 0)
-                        .addHealData("E", "ElementalArt_Heal_MaxHP_Percentage", 0.064f, 795f, false));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000035, "Qiqi", 1)
-                        .addHealData("E", "HealHP_OnHittingOthers", "HealHP_Const_OnHittingOthers", true)
-                        .addHealData("E", "ElementalArt_HealHp_Ratio", "ElementalArt_HealHp_Const", true)
-                        .addHealData("Q", "Avatar_Qiqi_ElementalBurst_ApplyModifier", 0.0191f, 1588f, false));
-        healDataAvatarList.add(
-                new HealDataAvatar(10000046, "Hutao", 0)
-                        .addHealData("Q", "Avatar_Hutao_VermilionBite_BakeMesh", 0.1166f, 0f, false));
-    }
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public void healHandler(AbilityInvokeEntry invoke) throws Exception {
-        AbilityMetaModifierChange data = AbilityMetaModifierChange.parseFrom(invoke.getAbilityData());
-
-        if (data == null) {
-            return;
-        }
-
-        GameEntity sourceEntity = player.getScene().getEntityById(data.getApplyEntityId());
-
-        String modifierString = "";
-        if (data.getParentAbilityName() != null) modifierString = data.getParentAbilityName().getStr();
-
-        if (sourceEntity != null) checkAndHeal(sourceEntity, modifierString);
-    }
-
-    public void checkAndHeal(GameEntity sourceEntity, String modifierString) {
-        int fightPropertyType = 0;
-        float healAmount = 0;
-        float ratio = 0, base = 0;
-        float maxHP, curHP, curAttack, curDefense;
-        Map<String, Float> map = sourceEntity.getMetaOverrideMap();
-
-        for (int i = 0; i < healDataAvatarList.size(); i++) {
-            HealDataAvatar healDataAvatar = healDataAvatarList.get(i);
-            if (modifierString.contains(healDataAvatar.avatarName)) {
-                fightPropertyType = healDataAvatar.fightPropertyType;
-                ArrayList<HealData> healDataList = healDataAvatar.healDataList;
-
-                for (int j = 0; j < healDataList.size(); j++) {
-                    HealData healData = healDataList.get(j);
-                    if (map.containsKey(healData.sRatio) || modifierString.equals(healData.sRatio)) {
-                        if (healData.isString) {
-                            ratio = map.get(healData.sRatio);
-                            base = map.get(healData.sBase);
-                        } else {
-                            ratio = healData.fRatio;
-                            base = healData.fBase;
-                        }
-                    }
-
-                    List<EntityAvatar> activeTeam = player.getTeamManager().getActiveTeam();
-                    List<EntityAvatar> needHealAvatars = new ArrayList();
-                    int currentIndex = player.getTeamManager().getCurrentCharacterIndex();
-                    EntityAvatar currentAvatar = activeTeam.get(currentIndex);
-                    if (healData.healAll) {
-                        needHealAvatars = activeTeam;
-                    } else {
-                        needHealAvatars.add(currentAvatar);
-                    }
-
-                    EntityAvatar healActionAvatar = null;
-                    for (int k = 0; k < activeTeam.size(); k++) {
-                        EntityAvatar avatar = activeTeam.get(k);
-                        int avatarId = avatar.getAvatar().getAvatarId();
-                        if (avatarId == healDataAvatar.avatarId) {
-                            healActionAvatar = avatar;
-                            break;
-                        }
-                    }
-
-                    if (healActionAvatar != null) {
-                        maxHP = healActionAvatar.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-                        curHP = healActionAvatar.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-                        curAttack = healActionAvatar.getFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK);
-                        curDefense = healActionAvatar.getFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE);
-
-                        // Special case for Hu Tao:
-                        if (healDataAvatar.avatarName.equals("Hutao") && curHP <= maxHP * 0.5 && ratio != 0) {
-                            ratio = 0.1555f;
-                        }
-
-                        switch (fightPropertyType) {
-                            case 0:
-                                healAmount = ratio * maxHP + base;
-                                break;
-                            case 1:
-                                healAmount = ratio * curAttack + base;
-                                break;
-                            case 2:
-                                healAmount = ratio * curDefense + base;
-                                break;
-                        }
-                    }
-
-                    for (int k = 0; k < needHealAvatars.size(); k++) {
-                        EntityAvatar avatar = needHealAvatars.get(k);
-                        avatar.heal(healAmount);
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    private class HealData {
-        public boolean isString = true;
-        public String abilityType = ""; // "E" or "Q"
-        public String sRatio = "";
-        public String sBase = "";
-        public float fRatio = 0;
-        public float fBase = 0;
-        public boolean healAll = false;
-
-        public HealData(String _abilityType, String _sRatio, String _sBase, boolean _healAll) {
-            abilityType = _abilityType;
-            isString = true;
-            sRatio = _sRatio;
-            sBase = _sBase;
-            healAll = _healAll;
-        }
-
-        public HealData(
-                String _abilityType, String _sRatio, float _fRatio, float _fBase, boolean _healAll) {
-            abilityType = _abilityType;
-            isString = false;
-            sRatio = _sRatio;
-            fRatio = _fRatio;
-            fBase = _fBase;
-            healAll = _healAll;
-        }
-    }
-
-    private class HealDataAvatar {
-        public int avatarId = 0;
-        public String avatarName = "";
-        public int fightPropertyType = 0; // 0: maxHP, 1: curAttack, 2: curDefense
-        public ArrayList<HealData> healDataList;
-
-        public HealDataAvatar(int _avatarId, String _avatarName, int _fightPropertyType) {
-            avatarId = _avatarId;
-            avatarName = _avatarName;
-            fightPropertyType = _fightPropertyType;
-            healDataList = new ArrayList();
-        }
-
-        public HealDataAvatar addHealData(
-                String abilityType, String sRatio, String sBase, boolean healAll) {
-            HealData healData = new HealData(abilityType, sRatio, sBase, healAll);
-            healDataList.add(healData);
-            return this;
-        }
-
-        public HealDataAvatar addHealData(
-                String abilityType, String sRatio, float fRatio, float fBase, boolean healAll) {
-            HealData healData = new HealData(abilityType, sRatio, fRatio, fBase, healAll);
-            healDataList.add(healData);
-            return this;
-        }
-    }
-}

src/main/java/emu/grasscutter/game/ability/actions/AbilityAction.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.ability;
+package emu.grasscutter.game.ability.actions;
 
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import java.lang.annotation.Retention;

src/main/java/emu/grasscutter/game/ability/actions/AbilityActionHandler.java

@@ -0,0 +1,13 @@
+package emu.grasscutter.game.ability.actions;
+
+import com.google.protobuf.ByteString;
+
+import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
+import emu.grasscutter.game.ability.Ability;
+import emu.grasscutter.game.entity.GameEntity;
+
+public abstract class AbilityActionHandler {
+
+    public abstract boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target);
+
+}

src/main/java/emu/grasscutter/game/ability/actions/ActionApplyModifier.java

@@ -1,48 +1,37 @@
 package emu.grasscutter.game.ability.actions;
 
+import com.google.protobuf.ByteString;
+
 import emu.grasscutter.Grasscutter;
+
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
-import emu.grasscutter.data.common.DynamicFloat;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.ability.AbilityAction;
-import emu.grasscutter.game.ability.AbilityActionHandler;
 import emu.grasscutter.game.ability.AbilityModifierController;
+import emu.grasscutter.game.entity.GameEntity;
 
 @AbilityAction(AbilityModifierAction.Type.ApplyModifier)
-public final class ActionApplyModifier extends AbilityActionHandler {
+public class ActionApplyModifier extends AbilityActionHandler {
     @Override
-    public boolean execute(Ability ability, AbilityModifierAction action) {
-        var modifierData = ability.getData().modifiers.get(action.modifierName);
-        if (modifierData == null) {
-            Grasscutter.getLogger().debug("Modifier {} not found", action.modifierName);
-            return false;
-        }
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        //var modifierData = ability.getData().modifiers.get(action.modifierName);
+        //if(modifierData == null) {
+        //    Grasscutter.getLogger().debug("Modifier {} not found", action.modifierName);
+        //    return false;
+        //}
+//
+        //if(modifierData.stacking != null && modifierData.stacking.compareTo("Unique") == 0 &&
+        //    ability.getModifiers().values().stream().filter(m -> m.getData().equals(modifierData)).count() != 0) {
+        //    return true;
+        //}
+//
+        ////TODO: Check predicates before executing all of these actions
+//
+        //AbilityModifierController modifier = new AbilityModifierController(ability, modifierData);
+        //ability.getModifiers().put(action.modifierName, modifier);
+        //modifier.onAdded();
+//
+        //return true;
 
-        if (modifierData.stacking != null
-                && modifierData.stacking.compareTo("Unique") == 0
-                && ability.getModifiers().values().stream()
-                        .anyMatch(m -> m.getData().equals(modifierData))) {
-            return true;
-        }
-
-        var modifier = new AbilityModifierController(ability, modifierData);
-        ability.getModifiers().put(action.modifierName, modifier);
-        modifier.onAdded();
-
-        if (modifierData.duration != DynamicFloat.ZERO) {
-            Grasscutter.getGameServer()
-                    .getScheduler()
-                    .scheduleAsyncTask(
-                            () -> {
-                                try {
-                                    Thread.sleep((int) (modifierData.duration.get() * 1000));
-                                    modifier.onRemoved();
-                                } catch (InterruptedException ignored) {
-                                    Grasscutter.getLogger().error("Failed to schedule ability modifier async task.");
-                                }
-                            });
-        }
-
-        return true;
+        return false; //TODO
     }
 }

src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java

@@ -0,0 +1,47 @@
+package emu.grasscutter.game.ability.actions;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
+import emu.grasscutter.game.ability.Ability;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.CampTargetType;
+import emu.grasscutter.net.proto.AbilityActionCreateGadgetOuterClass.AbilityActionCreateGadget;
+import emu.grasscutter.game.world.Position;
+
+@AbilityAction(AbilityModifierAction.Type.CreateGadget)
+public class ActionCreateGadget extends AbilityActionHandler {
+
+    @Override
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        if(!action.byServer) {
+            Grasscutter.getLogger().debug("Action not executed by server");
+
+            return true;
+        }
+
+        var entity = ability.getOwner();
+        AbilityActionCreateGadget createGadget;
+        try {
+            createGadget = AbilityActionCreateGadget.parseFrom(abilityData);
+        } catch (InvalidProtocolBufferException e) {
+            return false;
+        }
+
+        var entityCreated = new EntityGadget(entity.getScene(), action.gadgetID, new Position(createGadget.getPos()), new Position(createGadget.getRot()), action.campID, CampTargetType.getTypeByName(action.campTargetType).getValue());
+        if(action.ownerIsTarget)
+            entityCreated.setOwner(target);
+        else
+        entityCreated.setOwner(entity);
+
+        entity.getScene().addEntity(entityCreated);
+
+        Grasscutter.getLogger().info("Gadget {} created at pos {} rot {}", action.gadgetID, entityCreated.getPosition(), entityCreated.getRotation());
+
+        return true;
+    }
+
+}

src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java

@@ -1,20 +1,21 @@
 package emu.grasscutter.game.ability.actions;
 
+import com.google.protobuf.ByteString;
+
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.ability.AbilityAction;
-import emu.grasscutter.game.ability.AbilityActionHandler;
+import emu.grasscutter.game.entity.GameEntity;
 
 @AbilityAction(AbilityModifierAction.Type.ExecuteGadgetLua)
-public final class ActionExecuteGadgetLua extends AbilityActionHandler {
+public class ActionExecuteGadgetLua extends AbilityActionHandler {
     @Override
-    public boolean execute(Ability ability, AbilityModifierAction action) {
-        var owner = ability.getOwner();
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        GameEntity owner = ability.getOwner();
 
-        if (owner.getEntityController() != null) {
-            owner
-                    .getEntityController()
-                    .onClientExecuteRequest(owner, action.param1, action.param2, action.param3);
+        //Investigate if we need to use target
+
+        if(owner.getEntityController() != null) {
+            owner.getEntityController().onClientExecuteRequest(owner, action.param1, action.param2, action.param3);
             return true;
         }
 

src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java

@@ -0,0 +1,69 @@
+package emu.grasscutter.game.ability.actions;
+
+import com.google.protobuf.ByteString;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
+import emu.grasscutter.game.ability.Ability;
+import emu.grasscutter.game.entity.EntityClientGadget;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.FightProperty;
+
+@AbilityAction(AbilityModifierAction.Type.HealHP)
+public final class ActionHealHP extends AbilityActionHandler {
+    @Override
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        Grasscutter.getLogger().debug("Heal ability action executing 1");
+
+        var owner = ability.getOwner();
+        //handle client gadgets, that the effective caster is the current local avatar
+        if (owner instanceof EntityClientGadget ownerGadget) {
+            owner = ownerGadget.getScene().getEntityById(ownerGadget.getOwnerEntityId()); // Caster for EntityClientGadget
+            Grasscutter.getLogger().debug("Owner {} has top owner {}: {}", ability.getOwner(), ownerGadget.getOwnerEntityId(), owner);
+        }
+
+        if (owner == null) return false;
+
+        ability.getAbilitySpecials().forEach((k, v) ->
+            Grasscutter.getLogger().trace(">>> {}: {}", k, v));
+
+        var amountByCasterMaxHPRatio = action.amountByCasterMaxHPRatio.get(ability);
+        var amountByCasterAttackRatio = action.amountByCasterAttackRatio.get(ability);
+        var amountByCasterCurrentHPRatio = action.amountByCasterCurrentHPRatio.get(ability);
+        var amountByTargetCurrentHPRatio = action.amountByTargetCurrentHPRatio.get(ability);
+        var amountByTargetMaxHPRatio = action.amountByTargetMaxHPRatio.get(ability);
+
+        Grasscutter.getLogger().trace("amountByCasterMaxHPRatio: " + amountByCasterMaxHPRatio);
+        Grasscutter.getLogger().trace("amountByCasterAttackRatio: " + amountByCasterAttackRatio);
+        Grasscutter.getLogger().trace("amountByCasterCurrentHPRatio: " + amountByCasterCurrentHPRatio);
+        Grasscutter.getLogger().trace("amountByTargetCurrentHPRatio: " + amountByTargetCurrentHPRatio);
+        Grasscutter.getLogger().trace("amountByTargetMaxHPRatio: " + amountByTargetMaxHPRatio);
+
+        var amountToRegenerate = action.amount.get(ability);
+        Grasscutter.getLogger().trace("Base amount: " + amountToRegenerate);
+
+        amountToRegenerate += amountByCasterMaxHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+        amountToRegenerate += amountByCasterAttackRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK);
+        amountToRegenerate += amountByCasterCurrentHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+
+        Grasscutter.getLogger().trace("amountToRegenerate: " + amountToRegenerate);
+
+        var abilityRatio = 1.0f;
+        Grasscutter.getLogger().trace("Base abilityRatio: " + abilityRatio);
+
+        if (!action.ignoreAbilityProperty) abilityRatio +=
+            target.getFightProperty(FightProperty.FIGHT_PROP_HEAL_ADD) +
+                target.getFightProperty(FightProperty.FIGHT_PROP_HEALED_ADD);
+
+        Grasscutter.getLogger().trace("abilityRatio: " + abilityRatio);
+
+        Grasscutter.getLogger().trace("Sub-regenerate amount: " + amountToRegenerate);
+        amountToRegenerate += amountByTargetCurrentHPRatio * target.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+        amountToRegenerate += amountByTargetMaxHPRatio * target.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+
+        Grasscutter.getLogger().debug(">>> Healing {} without ratios", amountToRegenerate);
+        target.heal(amountToRegenerate * abilityRatio * action.healRatio.get(ability, 1f), action.muteHealEffect);
+
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/ability/actions/ActionKillSelf.java

@@ -1,17 +1,18 @@
 package emu.grasscutter.game.ability.actions;
 
+import com.google.protobuf.ByteString;
+
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.game.ability.Ability;
-import emu.grasscutter.game.ability.AbilityAction;
-import emu.grasscutter.game.ability.AbilityActionHandler;
+import emu.grasscutter.game.entity.GameEntity;
 
 @AbilityAction(AbilityModifierAction.Type.KillSelf)
-public final class ActionKillSelf extends AbilityActionHandler {
+public class ActionKillSelf extends AbilityActionHandler {
     @Override
-    public boolean execute(Ability ability, AbilityModifierAction action) {
-        var owner = ability.getOwner();
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        GameEntity owner = ability.getOwner();
         owner.getScene().killEntity(owner);
 
-        return false;
+        return true;
     }
 }

src/main/java/emu/grasscutter/game/ability/actions/ActionLoseHP.java

@@ -0,0 +1,59 @@
+package emu.grasscutter.game.ability.actions;
+
+import com.google.protobuf.ByteString;
+import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
+import emu.grasscutter.game.ability.Ability;
+import emu.grasscutter.game.entity.EntityClientGadget;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.FightProperty;
+
+@AbilityAction(AbilityModifierAction.Type.LoseHP)
+public class ActionLoseHP extends AbilityActionHandler {
+    @Override
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        GameEntity owner = ability.getOwner();
+        // handle client gadgets, that the effective caster is the current local avatar
+        if (owner instanceof EntityClientGadget ownerGadget) {
+            owner = ownerGadget.getScene().getEntityById(ownerGadget.getOwnerEntityId()); //Caster for EntityClientGadget
+
+            // TODO: Do this per entity, not just the player
+            if (ownerGadget.getOwner().getAbilityManager().isAbilityInvulnerable()) return true;
+        }
+        if (owner == null || target == null) return false;
+
+        if (action.enableLockHP && target.isLockHP()) {
+            return true;
+        }
+
+        if (action.disableWhenLoading && target.getScene().getWorld().getHost().getSceneLoadState().getValue() < 2) {
+            return true;
+        }
+
+        var amountByCasterMaxHPRatio = action.amountByCasterMaxHPRatio.get(ability);
+        var amountByCasterAttackRatio = action.amountByCasterAttackRatio.get(ability);
+        var amountByCasterCurrentHPRatio = action.amountByCasterCurrentHPRatio.get(ability); //Seems unused on server
+        var amountByTargetCurrentHPRatio = action.amountByTargetCurrentHPRatio.get(ability);
+        var amountByTargetMaxHPRatio = action.amountByTargetMaxHPRatio.get(ability);
+        var limboByTargetMaxHPRatio = action.limboByTargetMaxHPRatio.get(ability);
+
+        var amountToLose = action.amount.get(ability);
+        amountToLose += amountByCasterMaxHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+        amountToLose += amountByCasterAttackRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK);
+        amountToLose += amountByCasterCurrentHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+
+        var currentHp = target.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+        var maxHp = target.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+        amountToLose += amountByTargetCurrentHPRatio * currentHp;
+        amountToLose += amountByTargetMaxHPRatio * maxHp;
+
+        if (limboByTargetMaxHPRatio > 1.192093e-07)
+            amountToLose = (float) Math.min(Math.max(currentHp - Math.max(limboByTargetMaxHPRatio * maxHp, 1.0), 0.0), amountToLose);
+
+        if (currentHp < (amountToLose + 0.01) && !action.lethal)
+            amountToLose = 0;
+
+        target.damage(amountToLose);
+
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/ability/actions/ActionPredicated.java

@@ -0,0 +1,16 @@
+package emu.grasscutter.game.ability.actions;
+
+import com.google.protobuf.ByteString;
+
+import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
+import emu.grasscutter.game.ability.Ability;
+import emu.grasscutter.game.entity.GameEntity;
+
+@AbilityAction(AbilityModifierAction.Type.Predicated)
+public class ActionPredicated extends AbilityActionHandler {
+    @Override
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        //This doesn't do nothing on server
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/ability/actions/ActionSetGlobalValueToOverrideMap.java

@@ -0,0 +1,39 @@
+package emu.grasscutter.game.ability.actions;
+
+import com.google.protobuf.ByteString;
+
+import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
+import emu.grasscutter.game.ability.Ability;
+import emu.grasscutter.game.entity.EntityClientGadget;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.GameEntity;
+
+@AbilityAction(AbilityModifierAction.Type.SetGlobalValueToOverrideMap)
+public class ActionSetGlobalValueToOverrideMap extends AbilityActionHandler {
+    @Override
+    public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
+        //TODO:
+        var entity = target;
+        if(action.isFromOwner) {
+            if(target instanceof EntityClientGadget gadget)
+                entity = entity.getScene().getEntityById(gadget.getOwnerEntityId());
+            else if(target instanceof EntityGadget gadget)
+                entity = gadget.getOwner();
+        }
+
+        var globalValueKey = action.globalValueKey;
+        var abilityFormula = action.abilityFormula;
+
+        if(!entity.getGlobalAbilityValues().containsKey(globalValueKey))
+            return false;
+
+        var globalValue = entity.getGlobalAbilityValues().getOrDefault(globalValueKey, 0.0f);
+        if(abilityFormula.compareTo("DummyThrowSpeed") == 0) {
+            globalValue = ((globalValue * 30.0f) / ((float)Math.sin(0.9424778) * 100.0f)) - 1.0f;
+        }
+
+        entity.getGlobalAbilityValues().put(globalValueKey, globalValue);
+
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/ability/mixins/AbilityMixin.java

@@ -0,0 +1,11 @@
+package emu.grasscutter.game.ability.mixins;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import emu.grasscutter.data.binout.AbilityMixinData;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AbilityMixin {
+    AbilityMixinData.Type value();
+}

src/main/java/emu/grasscutter/game/ability/mixins/AbilityMixinHandler.java

@@ -0,0 +1,12 @@
+package emu.grasscutter.game.ability.mixins;
+
+import com.google.protobuf.ByteString;
+
+import emu.grasscutter.data.binout.AbilityMixinData;
+import emu.grasscutter.game.ability.Ability;
+
+public abstract class AbilityMixinHandler {
+
+    public abstract boolean execute(Ability ability, AbilityMixinData mixinData, ByteString abilityData);
+
+}

src/main/java/emu/grasscutter/game/activity/PlayerActivityData.java

@@ -13,15 +13,16 @@ import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass;
 import emu.grasscutter.server.packet.send.PacketActivityUpdateWatcherNotify;
 import emu.grasscutter.utils.JsonUtils;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Data;
 import lombok.experimental.FieldDefaults;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 @Entity("activities")
 @Data
 @FieldDefaults(level = AccessLevel.PRIVATE)
@@ -111,9 +112,13 @@ public class PlayerActivityData {
         }
 
         public static WatcherInfo init(ActivityWatcher watcher) {
+            var watcherData = watcher.getActivityWatcherData();
+            var progress = watcherData != null ?
+                watcherData.getProgress() : 0;
+
             return WatcherInfo.of()
                     .watcherId(watcher.getWatcherId())
-                    .totalProgress(watcher.getActivityWatcherData().getProgress())
+                    .totalProgress(progress)
                     .isTakenReward(false)
                     .build();
         }

src/main/java/emu/grasscutter/game/avatar/Avatar.java

@@ -1,7 +1,5 @@
 package emu.grasscutter.game.avatar;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import dev.morphia.annotations.*;
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.data.GameData;
@@ -24,6 +22,7 @@ import emu.grasscutter.data.excels.trial.TrialAvatarTemplateData;
 import emu.grasscutter.data.excels.weapon.WeaponCurveData;
 import emu.grasscutter.data.excels.weapon.WeaponPromoteData;
 import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.ability.Ability;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.inventory.EquipType;
 import emu.grasscutter.game.inventory.GameItem;
@@ -42,16 +41,19 @@ import emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.TrialAvatarInfo;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.*;
-import java.util.*;
-import java.util.stream.Stream;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.val;
 import org.bson.types.ObjectId;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
+import java.util.stream.Stream;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 @Entity(value = "avatars", useDiscriminator = false)
 public class Avatar {
     @Transient @Getter private final Int2ObjectMap<GameItem> equips;
@@ -282,8 +284,9 @@ public class Avatar {
                 .forEach(proudSkillId -> this.proudSkillList.add(proudSkillId));
         this.recalcStats();
 
-        // Send the depot change notification.
-        if (notify) this.owner.sendPacket(new PacketAvatarSkillDepotChangeNotify(this));
+        if (notify){
+            owner.sendPacket(new PacketAvatarSkillDepotChangeNotify(this));
+        }
     }
 
     /**

src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java

@@ -13,12 +13,12 @@ import emu.grasscutter.scripts.data.SceneTrigger;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.packet.send.PacketDungeonChallengeBeginNotify;
 import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 @Getter
 @Setter
 public class WorldChallenge {
@@ -27,7 +27,7 @@ public class WorldChallenge {
     private final int challengeId;
     private final int challengeIndex;
     private final List<Integer> paramList;
-    private final int timeLimit;
+    private int timeLimit;
     private final List<ChallengeTrigger> challengeTriggers;
     private final int goal;
     private final AtomicInteger score;
@@ -112,24 +112,10 @@ public class WorldChallenge {
         }
 
         // TODO: record the time in PARAM2 and used in action
-        // TODO: Set 'eventSource' in script arguments.
-        // Event source should be set to '1' for timer challenges.
-
-        var eventSource = new AtomicReference<>("");
-        // TODO: This is a hack to get the event source.
-        // This should be properly implemented.
-        scriptManager
-                .getTriggersByEvent(EventType.EVENT_CHALLENGE_SUCCESS)
-                .forEach(
-                        trigger -> {
-                            if (trigger.currentGroup.id == this.getGroup().id) {
-                                eventSource.set(trigger.getSource());
-                            }
-                        });
         scriptManager.callEvent(
                 new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_SUCCESS)
                         .setParam2(finishedTime)
-                        .setEventSource(eventSource.get()));
+                        .setEventSource(this.getChallengeIndex()));
 
         this.getScene()
                 .triggerDungeonEvent(
@@ -145,23 +131,10 @@ public class WorldChallenge {
         this.finish(false);
 
         // TODO: Set 'eventSource' in script arguments.
-        // Event source should be set to '1' for timer challenges.
-        var eventSource = new AtomicReference<>("");
-        // TODO: This is a hack to get the event source.
-        // This should be properly implemented.
         var scriptManager = this.getScene().getScriptManager();
-        scriptManager
-                .getTriggersByEvent(EventType.EVENT_CHALLENGE_FAIL)
-                .forEach(
-                        trigger -> {
-                            if (trigger.currentGroup.id == this.getGroup().id) {
-                                eventSource.set(trigger.getSource());
-                            }
-                        });
-
         scriptManager.callEvent(
                 new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_FAIL)
-                        .setEventSource(eventSource.get()));
+                        .setEventSource(this.getChallengeIndex()));
         challengeTriggers.forEach(t -> t.onFinish(this));
     }
 

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/ChallengeFactory.java

@@ -18,6 +18,7 @@ public abstract class ChallengeFactory {
         challengeFactoryHandlers.add(new KillMonsterTimeChallengeFactoryHandler());
         challengeFactoryHandlers.add(new SurviveChallengeFactoryHandler());
         challengeFactoryHandlers.add(new TriggerInTimeChallengeFactoryHandler());
+        challengeFactoryHandlers.add(new KillMonsterCountInTimeIncChallengeFactoryHandler());
     }
 
     public static WorldChallenge getChallenge(

src/main/java/emu/grasscutter/game/dungeons/challenge/factory/KillMonsterCountInTimeIncChallengeFactoryHandler.java

@@ -0,0 +1,33 @@
+package emu.grasscutter.game.dungeons.challenge.factory;
+
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.dungeons.challenge.enums.ChallengeType;
+import emu.grasscutter.game.dungeons.challenge.trigger.InTimeTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterCountTrigger;
+import emu.grasscutter.game.dungeons.challenge.trigger.KillMonsterTimeIncTrigger;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.scripts.data.SceneGroup;
+import lombok.val;
+
+import java.util.List;
+
+public class KillMonsterCountInTimeIncChallengeFactoryHandler  implements ChallengeFactoryHandler{
+    @Override
+    public boolean isThisType(ChallengeType challengeType) {
+        return challengeType == ChallengeType.CHALLENGE_TIME_FLY;
+    }
+
+    @Override
+    public WorldChallenge build(int challengeIndex, int challengeId, int groupId, int monsterCount, int timeLimit, int timeInc, Scene scene, SceneGroup group) {
+        val realGroup = scene.getScriptManager().getGroupById(groupId);
+        return new WorldChallenge(
+            scene, realGroup,
+            challengeId, // Id
+            challengeIndex, // Index
+            List.of(monsterCount, timeLimit, timeInc),
+            timeLimit, // Limit
+            monsterCount,  // Goal
+            List.of(new KillMonsterCountTrigger(), new InTimeTrigger(), new KillMonsterTimeIncTrigger(timeInc))
+        );
+    }
+}

src/main/java/emu/grasscutter/game/dungeons/challenge/trigger/KillMonsterTimeIncTrigger.java

@@ -0,0 +1,26 @@
+package emu.grasscutter.game.dungeons.challenge.trigger;
+
+import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.server.packet.send.PacketChallengeDataNotify;
+
+public class KillMonsterTimeIncTrigger extends ChallengeTrigger{
+
+    private int increment;
+
+    public KillMonsterTimeIncTrigger(int increment) {
+        this.increment = increment;
+    }
+
+    @Override
+    public void onBegin(WorldChallenge challenge) {
+        //challenge.getScene().broadcastPacket(new PacketChallengeDataNotify(challenge, 0, challenge.getScore().get()));
+    }
+
+    @Override
+    public void onMonsterDeath(WorldChallenge challenge, EntityMonster monster) {
+        challenge.getScene().broadcastPacket(new PacketChallengeDataNotify(challenge, 0, increment));
+
+        challenge.setTimeLimit(challenge.getTimeLimit() + increment);
+    }
+}

src/main/java/emu/grasscutter/game/entity/EntityAvatar.java

@@ -69,6 +69,8 @@ public class EntityAvatar extends GameEntity {
             Grasscutter.getLogger()
                     .error("Unable to create EntityAvatar instance; provided scene is null.");
         }
+
+        this.initAbilities();
     }
 
     @Override
@@ -100,11 +102,13 @@ public class EntityAvatar extends GameEntity {
         return getAvatar().getFightProperties();
     }
 
+    /**
+     * @return The entity ID of the avatar's equipped weapon.
+     */
     public int getWeaponEntityId() {
-        if (getAvatar().getWeapon() != null) {
-            return getAvatar().getWeapon().getWeaponEntityId();
-        }
-        return 0;
+        var avatar = this.getAvatar();
+        return avatar.getWeapon() == null ? 0 :
+            avatar.getWeapon().getWeaponEntityId();
     }
 
     @Override
@@ -125,28 +129,38 @@ public class EntityAvatar extends GameEntity {
     }
 
     @Override
-    public float heal(float amount) {
+    public void initAbilities() {
+    }
+
+    private void addConfigAbility(String abilityName){
+        var data = GameData.getAbilityData(abilityName);
+        if (data != null) this.getScene().getWorld()
+            .getHost().getAbilityManager().addAbilityToEntity(this, data);
+    }
+
+    @Override
+    public float heal(float amount, boolean mute) {
         // Do not heal character if they are dead
         if (!this.isAlive()) {
             return 0f;
         }
 
-        float healed = super.heal(amount);
+        float healed = super.heal(amount, mute);
 
         if (healed > 0f) {
-            getScene()
-                    .broadcastPacket(
-                            new PacketEntityFightPropChangeReasonNotify(
-                                    this,
-                                    FightProperty.FIGHT_PROP_CUR_HP,
-                                    healed,
-                                    PropChangeReason.PROP_CHANGE_REASON_ABILITY,
-                                    ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY));
+            getScene().broadcastPacket(
+                new PacketEntityFightPropChangeReasonNotify(this, FightProperty.FIGHT_PROP_CUR_HP, healed, mute ? PropChangeReason.PROP_CHANGE_REASON_NONE : PropChangeReason.PROP_CHANGE_REASON_ABILITY, ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY)
+            );
         }
 
         return healed;
     }
 
+    @Override
+    public float heal(float amount) {
+        return this.heal(amount, false);
+    }
+
     public void clearEnergy(ChangeEnergyReason reason) {
         // Fight props.
         val curEnergyProp = this.getAvatar().getSkillDepot().getElementType().getCurEnergyProp();

src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java

@@ -18,14 +18,23 @@ public abstract class EntityBaseGadget extends GameEntity {
     @Getter(onMethod_ = @Override)
     protected final Position rotation;
 
+    @Getter private final int campId;
+    @Getter private final int campType;
+
     public EntityBaseGadget(Scene scene) {
         this(scene, null, null);
     }
 
     public EntityBaseGadget(Scene scene, Position position, Position rotation) {
+        this(scene, position, rotation, 0, 0);
+    }
+
+    public EntityBaseGadget(Scene scene, Position position, Position rotation, int campId, int campType) {
         super(scene);
         this.position = position != null ? position.clone() : new Position();
         this.rotation = rotation != null ? rotation.clone() : new Position();
+        this.campId = campId;
+        this.campType = campType;
     }
 
     public abstract int getGadgetId();

src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java

@@ -1,5 +1,9 @@
 package emu.grasscutter.game.entity;
 
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.config.ConfigEntityGadget;
+import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
+import emu.grasscutter.data.excels.GadgetData;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.world.Position;
@@ -28,31 +32,53 @@ public class EntityClientGadget extends EntityBaseGadget {
     @Getter(onMethod_ = @Override)
     private int gadgetId;
 
-    @Getter private int campId;
-    @Getter private int campType;
     @Getter private int ownerEntityId;
     @Getter private int targetEntityId;
     @Getter private boolean asyncLoad;
 
     @Getter private int originalOwnerEntityId;
 
+    @Getter private final GadgetData gadgetData;
+    private ConfigEntityGadget configGadget;
+
     public EntityClientGadget(Scene scene, Player player, EvtCreateGadgetNotify notify) {
-        super(scene, new Position(notify.getInitPos()), new Position(notify.getInitEulerAngles()));
+        super(scene, new Position(notify.getInitPos()), new Position(notify.getInitEulerAngles()), notify.getCampId(), notify.getCampType());
         this.owner = player;
         this.id = notify.getEntityId();
         this.gadgetId = notify.getConfigId();
-        this.campId = notify.getCampId();
-        this.campType = notify.getCampType();
         this.ownerEntityId = notify.getPropOwnerEntityId();
         this.targetEntityId = notify.getTargetEntityId();
         this.asyncLoad = notify.getIsAsyncLoad();
 
+        this.gadgetData = GameData.getGadgetDataMap().get(gadgetId);
+        if (gadgetData != null && gadgetData.getJsonName() != null) {
+            this.configGadget = GameData.getGadgetConfigData().get(gadgetData.getJsonName());
+        }
+
         GameEntity owner = scene.getEntityById(this.ownerEntityId);
         if (owner instanceof EntityClientGadget ownerGadget) {
             this.originalOwnerEntityId = ownerGadget.getOriginalOwnerEntityId();
         } else {
             this.originalOwnerEntityId = this.ownerEntityId;
         }
+
+        this.initAbilities();
+    }
+
+    @Override
+    public void initAbilities() {
+        if(this.configGadget != null && this.configGadget.getAbilities() != null) {
+            for (var ability : this.configGadget.getAbilities()) {
+                addConfigAbility(ability);
+            }
+        }
+    }
+
+    private void addConfigAbility(ConfigAbilityData abilityData){
+        var data =  GameData.getAbilityData(abilityData.getAbilityName());
+        if (data != null)
+            owner.getAbilityManager().addAbilityToEntity(
+                this, data);
     }
 
     @Override

src/main/java/emu/grasscutter/game/entity/EntityGadget.java

@@ -1,5 +1,6 @@
 package emu.grasscutter.game.entity;
 
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.config.ConfigEntityGadget;
 import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
@@ -38,13 +39,14 @@ import emu.grasscutter.server.packet.send.PacketSceneTimeNotify;
 import emu.grasscutter.utils.helpers.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
 @ToString(callSuper = true)
 public class EntityGadget extends EntityBaseGadget {
     @Getter private final GadgetData gadgetData;
@@ -73,6 +75,8 @@ public class EntityGadget extends EntityBaseGadget {
     @Getter @Setter private int startValue = 0; // Controller related, inited to zero
     @Getter @Setter private int ticksSinceChange;
 
+    @Getter private boolean interactEnabled = true;
+
     public EntityGadget(Scene scene, int gadgetId, Position pos) {
         this(scene, gadgetId, pos, null, null);
     }
@@ -81,9 +85,16 @@ public class EntityGadget extends EntityBaseGadget {
         this(scene, gadgetId, pos, rot, null);
     }
 
-    public EntityGadget(
-            Scene scene, int gadgetId, Position pos, Position rot, GadgetContent content) {
-        super(scene, pos, rot);
+    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot, int campId, int campType) {
+        this(scene, gadgetId, pos, rot, null, campId, campType);
+    }
+
+    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot, GadgetContent content) {
+        this(scene, gadgetId, pos, rot, content, 0, 0);
+    }
+
+    public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot, GadgetContent content, int campId, int campType) {
+        super(scene, pos, rot, campId, campType);
 
         this.gadgetData = GameData.getGadgetDataMap().get(gadgetId);
         if (gadgetData != null && gadgetData.getJsonName() != null) {
@@ -98,14 +109,25 @@ public class EntityGadget extends EntityBaseGadget {
         this.fillFightProps(configGadget);
 
         if (GameData.getGadgetMappingMap().containsKey(gadgetId)) {
-            String controllerName = GameData.getGadgetMappingMap().get(gadgetId).getServerController();
+            var controllerName = GameData.getGadgetMappingMap().get(gadgetId).getServerController();
             this.setEntityController(EntityControllerScriptManager.getGadgetController(controllerName));
+            if (this.getEntityController() == null) {
+                Grasscutter.getLogger().warn("Gadget controller {} not found.", controllerName);
+            }
         }
 
-        this.addConfigAbilities();
+        this.initAbilities(); // TODO: move this
     }
 
-    private void addConfigAbilities() {
+    private void addConfigAbility(ConfigAbilityData abilityData){
+        var data =  GameData.getAbilityData(abilityData.getAbilityName());
+        if(data != null) this.getScene().getWorld().getHost()
+            .getAbilityManager().addAbilityToEntity(this, data);
+    }
+
+    @Override
+    public void initAbilities() {
+        //TODO: handle pre-dynamic, static and dynamic here
         if (this.configGadget != null && this.configGadget.getAbilities() != null) {
             for (var ability : this.configGadget.getAbilities()) {
                 this.addConfigAbility(ability);
@@ -113,14 +135,9 @@ public class EntityGadget extends EntityBaseGadget {
         }
     }
 
-    private void addConfigAbility(ConfigAbilityData abilityData) {
-        var data = GameData.getAbilityData(abilityData.getAbilityName());
-        if (data != null)
-            getScene()
-                    .getWorld()
-                    .getHost()
-                    .getAbilityManager()
-                    .addAbilityToEntity(this, data, abilityData.getAbilityID());
+    public void setInteractEnabled(boolean enable) {
+        this.interactEnabled = enable;
+        this.getScene().broadcastPacket(new PacketGadgetStateNotify(this, this.getState())); //Update the interact
     }
 
     public void setState(int state) {
@@ -172,6 +189,8 @@ public class EntityGadget extends EntityBaseGadget {
 
     @Override
     public void onInteract(Player player, GadgetInteractReq interactReq) {
+        if (!this.interactEnabled) return;
+
         if (this.getContent() == null) {
             return;
         }
@@ -289,14 +308,13 @@ public class EntityGadget extends EntityBaseGadget {
             addAllFightPropsToEntityInfo(entityInfo);
         }
 
-        SceneGadgetInfo.Builder gadgetInfo =
-                SceneGadgetInfo.newBuilder()
-                        .setGadgetId(this.getGadgetId())
-                        .setGroupId(this.getGroupId())
-                        .setConfigId(this.getConfigId())
-                        .setGadgetState(this.getState())
-                        .setIsEnableInteract(true)
-                        .setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
+        var gadgetInfo = SceneGadgetInfo.newBuilder()
+                .setGadgetId(this.getGadgetId())
+                .setGroupId(this.getGroupId())
+                .setConfigId(this.getConfigId())
+                .setGadgetState(this.getState())
+                .setIsEnableInteract(this.interactEnabled)
+                .setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
 
         if (this.metaGadget != null) {
             gadgetInfo.setDraftId(this.metaGadget.draft_id);

src/main/java/emu/grasscutter/game/entity/EntityItem.java

@@ -140,4 +140,10 @@ public class EntityItem extends EntityBaseGadget {
 
         return entityInfo.build();
     }
+
+    @Override
+    public void initAbilities() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'initAbilities'");
+    }
 }

src/main/java/emu/grasscutter/game/entity/EntityMonster.java

@@ -1,6 +1,8 @@
 package emu.grasscutter.game.entity;
 
 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.monster.MonsterCurveData;
@@ -9,6 +11,7 @@ import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
 import emu.grasscutter.game.player.Player;
 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.game.world.SceneGroupInstance;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
@@ -28,13 +31,14 @@ import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.SceneMonster;
 import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.event.entity.EntityDamageEvent;
-import emu.grasscutter.game.world.Position;
 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;
@@ -48,12 +52,14 @@ public class EntityMonster extends GameEntity {
     @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;
     @Getter private int weaponEntityId;
     @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) {
@@ -65,6 +71,13 @@ 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) {
@@ -72,6 +85,86 @@ public class EntityMonster extends GameEntity {
         }
 
         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

src/main/java/emu/grasscutter/game/entity/EntityNPC.java

@@ -79,4 +79,10 @@ public class EntityNPC extends GameEntity {
 
         return entityInfo.build();
     }
+
+    @Override
+    public void initAbilities() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'initAbilities'");
+    }
 }

src/main/java/emu/grasscutter/game/entity/EntityRegion.java

@@ -90,4 +90,10 @@ public class EntityRegion extends GameEntity {
     public int getFirstEntityId() {
         return entities.stream().findFirst().orElse(0);
     }
+
+    @Override
+    public void initAbilities() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'initAbilities'");
+    }
 }

src/main/java/emu/grasscutter/game/entity/EntityScene.java

@@ -0,0 +1,57 @@
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.AbilityData;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.game.world.Position;
+import it.unimi.dsi.fastutil.ints.Int2FloatArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+
+public class EntityScene extends GameEntity {
+
+    public EntityScene(Scene scene) {
+        super(scene);
+        initAbilities();
+    }
+
+    @Override
+    public void initAbilities() {
+        //Load abilities from levelElementAbilities
+        for(var ability : GameData.getConfigGlobalCombat().getDefaultAbilities().getLevelElementAbilities()) {
+            AbilityData data =  GameData.getAbilityData(ability);
+            if(data != null)
+                getScene().getWorld().getHost().getAbilityManager().addAbilityToEntity(
+                    this, data);
+        }
+    }
+
+    @Override
+    public int getEntityTypeId() {
+        return 0x13;
+    }
+
+    @Override
+    public Int2FloatMap getFightProperties() {
+        //TODO
+        return new Int2FloatArrayMap();
+    }
+
+    @Override
+    public Position getPosition() {
+        // TODO Auto-generated method stub
+        return new Position(0, 0, 0);
+    }
+
+    @Override
+    public Position getRotation() {
+        return new Position(0, 0, 0);
+    }
+
+    @Override
+    public SceneEntityInfo toProto() {
+        return null;
+    }
+
+}

src/main/java/emu/grasscutter/game/entity/EntityTeam.java

@@ -0,0 +1,68 @@
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.AbilityData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.game.world.Position;
+import it.unimi.dsi.fastutil.ints.Int2FloatArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+
+public class EntityTeam extends GameEntity {
+
+    private Player player;
+
+    public EntityTeam(Player player) {
+        super(player.getScene());
+        initAbilities();
+        this.id = player.getWorld().getNextEntityId(EntityIdType.TEAM);
+    }
+
+    @Override
+    public void initAbilities() {
+        //Load abilities from levelElementAbilities
+        var defaultAbilities = GameData.getConfigGlobalCombat().getDefaultAbilities();
+        if(defaultAbilities.getDefaultTeamAbilities() != null)
+            for(var ability : defaultAbilities.getDefaultTeamAbilities()) {
+                AbilityData data =  GameData.getAbilityData(ability);
+                if(data != null)
+                    player.getWorld().getHost().getAbilityManager().addAbilityToEntity(
+                        this, data);
+            }
+    }
+
+    @Override
+    public World getWorld() {
+        return player.getWorld();
+    }
+
+    @Override
+    public int getEntityTypeId() {
+        return EntityIdType.TEAM.getId();
+    }
+
+    @Override
+    public Int2FloatMap getFightProperties() {
+        //TODO
+        return new Int2FloatArrayMap();
+    }
+
+    @Override
+    public Position getPosition() {
+        // TODO Auto-generated method stub
+        return new Position(0, 0, 0);
+    }
+
+    @Override
+    public Position getRotation() {
+        return new Position(0, 0, 0);
+    }
+
+    @Override
+    public SceneEntityInfo toProto() {
+        return null;
+    }
+
+}

src/main/java/emu/grasscutter/game/entity/EntityVehicle.java

@@ -122,4 +122,10 @@ public class EntityVehicle extends EntityBaseGadget {
 
         return entityInfo.build();
     }
+
+    @Override
+    public void initAbilities() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'initAbilities'");
+    }
 }

src/main/java/emu/grasscutter/game/entity/EntityWorld.java

@@ -0,0 +1,67 @@
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.world.Position;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import it.unimi.dsi.fastutil.ints.Int2FloatArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import lombok.Getter;
+
+public class EntityWorld extends GameEntity {
+    @Getter private World world;
+
+    public EntityWorld(World world) {
+        super(null);
+
+        this.world = world;
+        this.id = world.getNextEntityId(EntityIdType.MPLEVEL);
+
+        this.initAbilities();
+    }
+
+    @Override
+    public Scene getScene() {
+        return this.world.getHost().getScene();
+    }
+
+    @Override
+    public void initAbilities() {
+        //Load abilities from levelElementAbilities
+        for (var ability : GameData.getConfigGlobalCombat()
+            .getDefaultAbilities().getDefaultMPLevelAbilities()) {
+            var data =  GameData.getAbilityData(ability);
+            if (data != null) world.getHost()
+                .getAbilityManager().addAbilityToEntity(this, data);
+        }
+    }
+
+    @Override
+    public int getEntityTypeId() {
+        return EntityIdType.TEAM.getId();
+    }
+
+    @Override
+    public Int2FloatMap getFightProperties() {
+        //TODO
+        return new Int2FloatArrayMap();
+    }
+
+    @Override
+    public Position getPosition() {
+        // TODO Auto-generated method stub
+        return new Position(0, 0, 0);
+    }
+
+    @Override
+    public Position getRotation() {
+        return new Position(0, 0, 0);
+    }
+
+    @Override
+    public SceneEntityInfo toProto() {
+        return null;
+    }
+}

src/main/java/emu/grasscutter/game/entity/GameEntity.java

@@ -1,6 +1,7 @@
 package emu.grasscutter.game.entity;
 
 import emu.grasscutter.game.ability.Ability;
+import emu.grasscutter.game.ability.AbilityModifierController;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.game.props.FightProperty;
@@ -24,11 +25,14 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2FloatMap;
 import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public abstract class GameEntity {
     @Getter private final Scene scene;
     @Getter protected int id;
@@ -48,19 +52,17 @@ public abstract class GameEntity {
     @Getter @Setter private EntityController entityController;
     @Getter private ElementType lastAttackType = ElementType.None;
 
-    // Abilities
-    private Object2FloatMap<String> metaOverrideMap;
-    private Int2ObjectMap<String> metaModifiers;
-    private Map<Integer, Integer> instanceToHash;
-    private Int2ObjectMap<String> instanceToName;
-
-    @Getter private Map<String, Ability> abilities = new HashMap<>();
+    @Getter private List<Ability> instancedAbilities = new ArrayList<>();
+    @Getter private Int2ObjectMap<AbilityModifierController> instancedModifiers = new Int2ObjectOpenHashMap<>();
+    @Getter private Map<String, Float> globalAbilityValues = new HashMap<>();
 
     public GameEntity(Scene scene) {
         this.scene = scene;
         this.motionState = MotionState.MOTION_STATE_NONE;
     }
 
+    public abstract void initAbilities();
+
     public int getEntityType() {
         return this.getId() >> 24;
     }
@@ -79,36 +81,6 @@ public abstract class GameEntity {
         return this.isAlive() ? LifeState.LIFE_ALIVE : LifeState.LIFE_DEAD;
     }
 
-    public Object2FloatMap<String> getMetaOverrideMap() {
-        if (this.metaOverrideMap == null) {
-            this.metaOverrideMap = new Object2FloatOpenHashMap<>();
-        }
-        return this.metaOverrideMap;
-    }
-
-    public Int2ObjectMap<String> getMetaModifiers() {
-        if (this.metaModifiers == null) {
-            this.metaModifiers = new Int2ObjectOpenHashMap<>();
-        }
-        return this.metaModifiers;
-    }
-
-    public Map<Integer, Integer> getInstanceToHash() {
-        if (this.instanceToHash == null) {
-            this.instanceToHash = new HashMap<>();
-        }
-
-        return this.instanceToHash;
-    }
-
-    public Int2ObjectMap<String> getInstanceToName() {
-        if (this.instanceToName == null) {
-            this.instanceToName = new Int2ObjectOpenHashMap<>();
-        }
-
-        return this.instanceToName;
-    }
-
     public abstract Int2FloatMap getFightProperties();
 
     public abstract Position getPosition();
@@ -155,6 +127,10 @@ public abstract class GameEntity {
     }
 
     public float heal(float amount) {
+        return heal(amount, false);
+    }
+
+    public float heal(float amount, boolean mute) {
         if (this.getFightProperties() == null) {
             return 0f;
         }
@@ -214,7 +190,6 @@ public abstract class GameEntity {
         }
 
         this.runLuaCallbacks(event);
-        this.runAbilityCallbacks(event);
 
         // Packets
         this.getScene()
@@ -238,15 +213,6 @@ public abstract class GameEntity {
         }
     }
 
-    /**
-     * Runs the ability callbacks for {@link EntityDamageEvent}.
-     *
-     * @param event The damage event.
-     */
-    public void runAbilityCallbacks(EntityDamageEvent event) {
-        this.abilities.values().forEach(ability -> ability.onBeingHit(event));
-    }
-
     /**
      * Move this entity to a new position.
      *

src/main/java/emu/grasscutter/game/entity/gadget/GadgetAbility.java

@@ -1,6 +1,6 @@
 package emu.grasscutter.game.entity.gadget;
 
-import emu.grasscutter.game.entity.EntityClientGadget;
+import emu.grasscutter.game.entity.EntityBaseGadget;
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.AbilityGadgetInfoOuterClass;
@@ -9,10 +9,11 @@ import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import lombok.val;
 
 public class GadgetAbility extends GadgetContent {
-    private EntityClientGadget parent;
+    private EntityBaseGadget parent;
 
-    public GadgetAbility(EntityGadget gadget, EntityClientGadget parent) {
+    public GadgetAbility(EntityGadget gadget, EntityBaseGadget parent) {
         super(gadget);
+
         this.parent = parent;
     }
 

src/main/java/emu/grasscutter/game/player/TeamManager.java

@@ -1,7 +1,5 @@
 package emu.grasscutter.game.player;
 
-import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
-
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Transient;
 import emu.grasscutter.GameConstants;
@@ -11,6 +9,7 @@ import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.entity.EntityBaseGadget;
+import emu.grasscutter.game.entity.EntityTeam;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.game.props.FightProperty;
@@ -33,12 +32,15 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import java.util.*;
-import java.util.stream.Stream;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.val;
 
+import java.util.*;
+import java.util.stream.Stream;
+
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
+
 @Entity
 public final class TeamManager extends BasePlayerDataManager {
     @Transient private final List<EntityAvatar> avatars;
@@ -50,7 +52,7 @@ public final class TeamManager extends BasePlayerDataManager {
     private int currentTeamIndex;
     @Getter @Setter private int currentCharacterIndex;
     @Transient @Getter @Setter private TeamInfo mpTeam;
-    @Transient @Getter @Setter private int entityId;
+    @Transient @Getter @Setter private EntityTeam entity;
 
     @Transient private int useTemporarilyTeamIndex = -1;
     @Transient private List<TeamInfo> temporaryTeam; // Temporary Team for tower
@@ -155,6 +157,9 @@ public final class TeamManager extends BasePlayerDataManager {
     }
 
     public EntityAvatar getCurrentAvatarEntity() {
+        // Check if any avatars are equipped.
+        if (this.getActiveTeam().size() == 0) return null;
+
         if (this.currentCharacterIndex >= this.getActiveTeam().size()) {
             this.currentCharacterIndex = 0; // Reset to the first character.
         }

src/main/java/emu/grasscutter/game/props/CampTargetType.java

@@ -0,0 +1,47 @@
+package emu.grasscutter.game.props;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import emu.grasscutter.scripts.constants.IntValueEnum;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+public enum CampTargetType implements IntValueEnum{
+    None (0),
+    Alliance (1),
+    Enemy (2),
+    Self (3),
+    SelfCamp (4),
+    All (5),
+    AllExceptSelf (6),
+    AllianceIncludeSelf (7);
+
+    private final int value;
+    private static final Int2ObjectMap<CampTargetType> map = new Int2ObjectOpenHashMap<>();
+    private static final Map<String, CampTargetType> stringMap = new HashMap<>();
+
+    static {
+        Stream.of(values()).forEach(e -> {
+            map.put(e.getValue(), e);
+            stringMap.put(e.name(), e);
+        });
+    }
+
+    private CampTargetType(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public static CampTargetType getTypeByValue(int value) {
+        return map.getOrDefault(value, None);
+    }
+
+    public static CampTargetType getTypeByName(String name) {
+        return stringMap.getOrDefault(name, None);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java

@@ -54,7 +54,7 @@ public class ExecNotifyGroupLua extends QuestExecHandler {
                                     : EventType.EVENT_QUEST_START;
                     scriptManager.callEvent(
                             new ScriptArgs(groupId, eventType, quest.getSubQuestId())
-                                    .setEventSource(String.valueOf(quest.getSubQuestId())));
+                                    .setEventSource(quest.getSubQuestId()));
                 });
 
         return true;

src/main/java/emu/grasscutter/game/world/Scene.java

@@ -41,14 +41,15 @@ import emu.grasscutter.server.event.player.PlayerTeleportEvent;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.objects.KahnsSort;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.val;
+
+import javax.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.val;
 
 public final class Scene {
     @Getter private final World world;
@@ -78,6 +79,8 @@ public final class Scene {
     @Getter private int tickCount = 0;
     @Getter private boolean isPaused = false;
 
+    @Getter private GameEntity sceneEntity;
+
     public Scene(World world, SceneData sceneData) {
         this.world = world;
         this.sceneData = sceneData;
@@ -98,6 +101,7 @@ public final class Scene {
         this.scriptManager = new SceneScriptManager(this);
         this.blossomManager = new BlossomManager(this);
         this.unlockedForces = new HashSet<>();
+        this.sceneEntity = new EntityScene(this);
     }
 
     public int getId() {
@@ -113,7 +117,25 @@ public final class Scene {
     }
 
     public GameEntity getEntityById(int id) {
-        return this.entities.get(id);
+        // Check if the scene's entity ID is referenced.
+        if (id == 0x13800001) return this.sceneEntity;
+        else if (id == this.getWorld().getLevelEntityId())
+            return this.getWorld().getEntity();
+
+        var teamEntityPlayer = players.stream().filter(p -> p.getTeamManager().getEntity().getId() == id).findAny();
+        if(teamEntityPlayer.isPresent())
+            return teamEntityPlayer.get().getTeamManager().getEntity();
+
+        var entity = this.entities.get(id);
+        if (entity == null && (id >> 24) == EntityType.Avatar.getValue()) {
+            for (var player : this.getPlayers()) {
+                for (var avatar : player.getTeamManager().getActiveTeam()) {
+                    if (avatar.getId() == id) return avatar;
+                }
+            }
+        }
+
+        return entity;
     }
 
     public GameEntity getEntityByConfigId(int configId) {
@@ -338,6 +360,14 @@ public final class Scene {
         addEntities(entities, VisionType.VISION_TYPE_BORN);
     }
 
+    public void updateEntity(GameEntity entity) {
+        this.broadcastPacket(new PacketSceneEntityUpdateNotify(entity));
+    }
+
+    public void updateEntity(GameEntity entity, VisionType type) {
+        this.broadcastPacket(new PacketSceneEntityUpdateNotify(Arrays.asList(entity), type));
+    }
+
     private static <T> List<List<T>> chopped(List<T> list, final int L) {
         List<List<T>> parts = new ArrayList<List<T>>();
         final int N = list.size();

src/main/java/emu/grasscutter/game/world/World.java

@@ -1,9 +1,9 @@
 package emu.grasscutter.game.world;
 
-import static emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType.SCRIPT;
-
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.dungeon.DungeonData;
+import emu.grasscutter.game.entity.EntityTeam;
+import emu.grasscutter.game.entity.EntityWorld;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.player.Player.SceneLoadState;
 import emu.grasscutter.game.props.EnterReason;
@@ -23,22 +23,24 @@ import emu.grasscutter.utils.ConversionUtils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.val;
 import org.jetbrains.annotations.NotNull;
 
-public final class World implements Iterable<Player> {
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import static emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType.SCRIPT;
+
+public class World implements Iterable<Player> {
     @Getter private final GameServer server;
     @Getter private final Player host;
     @Getter private final List<Player> players;
     @Getter private final Int2ObjectMap<Scene> scenes;
 
-    @Getter private int levelEntityId;
+    @Getter private EntityWorld entity;
     private int nextEntityId = 0;
     private int nextPeerId = 0;
     private int worldLevel;
@@ -60,7 +62,8 @@ public final class World implements Iterable<Player> {
         this.players = Collections.synchronizedList(new ArrayList<>());
         this.scenes = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
 
-        this.levelEntityId = this.getNextEntityId(EntityIdType.MPLEVEL);
+        // this.levelEntityId = this.getNextEntityId(EntityIdType.MPLEVEL);
+        this.entity = new EntityWorld(this);
         this.worldLevel = player.getWorldLevel();
         this.isMultiplayer = isMultiplayer;
 
@@ -70,6 +73,10 @@ public final class World implements Iterable<Player> {
         this.host.getServer().registerWorld(this);
     }
 
+    public int getLevelEntityId() {
+        return entity.getId();
+    }
+
     /**
      * Gets the peer ID of the world's host.
      *
@@ -116,7 +123,7 @@ public final class World implements Iterable<Player> {
     }
 
     public int getPlayerCount() {
-        return this.getPlayers().size();
+        return this.players.size();
     }
 
     /**
@@ -146,7 +153,8 @@ public final class World implements Iterable<Player> {
 
         // Set player variables
         player.setPeerId(this.getNextPeerId());
-        player.getTeamManager().setEntityId(this.getNextEntityId(EntityIdType.TEAM));
+        player.getTeamManager().setEntity(new EntityTeam(player));
+        //player.getTeamManager().setEntityId(this.getNextEntityId(EntityIdType.TEAM));
 
         // Copy main team to multiplayer team
         if (this.isMultiplayer()) {
@@ -174,9 +182,12 @@ public final class World implements Iterable<Player> {
         player.sendPacket(
                 new PacketDelTeamEntityNotify(
                         player.getSceneId(),
-                        this.getPlayers().stream()
-                                .map(p -> p.getTeamManager().getEntityId())
-                                .collect(Collectors.toList())));
+                    this.getPlayers().stream()
+                        .map(p ->
+                            p.getTeamManager().getEntity() == null ? 0 :
+                            p.getTeamManager().getEntity().getId()).toList()
+                )
+        );
 
         // Deregister
         this.getPlayers().remove(player);