fix: fix onEffectRemoved not triggered when effects are removed manually

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -492,10 +492,10 @@ void EnableEventListener(int eventId) {
         break;
 
     case EVENT_TYPES::onEffectAdded:
-        lse::events::entity::EffectApplyEvent();
+        lse::events::player::AddEffectEvent();
         break;
     case EVENT_TYPES::onEffectRemoved:
-        lse::events::entity::EffectExpiredEvent();
+        lse::events::player::RemoveEffectEvent();
         break;
     case EVENT_TYPES::onEffectUpdated:
         lse::events::entity::EffectUpdateEvent();

src/lse/events/EntityEvents.cpp

@@ -312,54 +312,6 @@ LL_TYPE_INSTANCE_HOOK(
     origin(owner, sourcePlayer, actionIndex, sceneName);
 }
 
-LL_TYPE_INSTANCE_HOOK(
-    EffectApplyHook,
-    HookPriority::Normal,
-    MobEffectInstance,
-    &MobEffectInstance::applyEffects,
-    void,
-    ::Actor& mob
-) {
-    IF_LISTENED(EVENT_TYPES::onEffectAdded) {
-        if (mob.isPlayer()) {
-            if (!CallEvent(
-                    EVENT_TYPES::onEffectAdded,
-                    PlayerClass::newPlayer(&static_cast<Player&>(mob)),
-                    String::newString(getComponentName().getString()),
-                    Number::newNumber(getAmplifier()),
-                    Number::newNumber(getDuration().getValueForSerialization())
-                )) {
-                return;
-            }
-        }
-    }
-    IF_LISTENED_END(EVENT_TYPES::onEffectAdded);
-    origin(mob);
-}
-
-LL_TYPE_INSTANCE_HOOK(
-    EffectExpiredHook,
-    HookPriority::Normal,
-    MobEffectInstance,
-    &MobEffectInstance::onEffectsExpired,
-    void,
-    ::Actor& mob
-) {
-    IF_LISTENED(EVENT_TYPES::onEffectRemoved) {
-        if (mob.isPlayer()) {
-            if (!CallEvent(
-                    EVENT_TYPES::onEffectRemoved,
-                    PlayerClass::newPlayer(&static_cast<Player&>(mob)),
-                    String::newString(getComponentName().getString())
-                )) {
-                return;
-            }
-        }
-    }
-    IF_LISTENED_END(EVENT_TYPES::onEffectRemoved);
-    origin(mob);
-}
-
 LL_TYPE_INSTANCE_HOOK(
     EffectUpdateHook,
     HookPriority::Normal,
@@ -424,8 +376,6 @@ void MobHurtEvent() {
     MobHurtEffectHook::hook();
 }
 void NpcCommandEvent() { NpcCommandHook::hook(); }
-void EffectApplyEvent() { EffectApplyHook::hook(); }
-void EffectExpiredEvent() { EffectExpiredHook::hook(); }
 void EffectUpdateEvent() { EffectUpdateHook::hook(); }
 void TransformationEvent() { TransformationHook::hook(); }
 } // namespace lse::events::entity

src/lse/events/EntityEvents.h

@@ -9,8 +9,6 @@ void ProjectileHitEntityEvent();
 void ProjectileHitBlockEvent();
 void MobHurtEvent();
 void NpcCommandEvent();
-void EffectApplyEvent();
-void EffectExpiredEvent();
 void EffectUpdateEvent();
 void TransformationEvent();
-}
+} // namespace lse::events::entity

src/lse/events/PlayerEvents.cpp

@@ -8,6 +8,7 @@
 #include "ll/api/memory/Memory.h"
 #include "ll/api/service/Bedrock.h"
 #include "mc/common/ActorUniqueID.h"
+#include "mc/deps/core/string/HashedString.h"
 #include "mc/deps/ecs/WeakEntityRef.h"
 #include "mc/server/ServerPlayer.h"
 #include "mc/server/module/VanillaServerGameplayEventListener.h"
@@ -19,6 +20,8 @@
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/actor/player/PlayerItemInUse.h"
 #include "mc/world/containers/models/LevelContainerModel.h"
+#include "mc/world/effect/EffectDuration.h"
+#include "mc/world/effect/MobEffectInstance.h"
 #include "mc/world/events/BlockEventCoordinator.h"
 #include "mc/world/events/EventResult.h"
 #include "mc/world/events/PlayerOpenContainerEvent.h"
@@ -596,6 +599,50 @@ LL_TYPE_INSTANCE_HOOK(
     return origin(actor, location);
 }
 
+LL_TYPE_INSTANCE_HOOK(
+    AddEffectHook,
+    HookPriority::Normal,
+    Player,
+    &Player::addEffect,
+    void,
+    ::MobEffectInstance const& effect
+) {
+    IF_LISTENED(EVENT_TYPES::onEffectAdded) {
+        if (!CallEvent(
+                EVENT_TYPES::onEffectAdded,
+                PlayerClass::newPlayer(this),
+                String::newString(effect.getComponentName().getString()),
+                Number::newNumber(effect.getAmplifier()),
+                Number::newNumber(effect.getDuration().getValueForSerialization())
+            )) {
+            return;
+        }
+    }
+    IF_LISTENED_END(EVENT_TYPES::onEffectAdded);
+    origin(effect);
+}
+
+LL_TYPE_INSTANCE_HOOK(
+    RemoveEffectHook,
+    HookPriority::Normal,
+    Player,
+    &Player::$onEffectRemoved,
+    void,
+    ::MobEffectInstance& effect
+) {
+    IF_LISTENED(EVENT_TYPES::onEffectRemoved) {
+        if (!CallEvent(
+                EVENT_TYPES::onEffectRemoved,
+                PlayerClass::newPlayer(this),
+                String::newString(effect.getComponentName().getString())
+            )) {
+            return;
+        }
+    }
+    IF_LISTENED_END(EVENT_TYPES::onEffectRemoved);
+    origin(effect);
+}
+
 void StartDestroyBlock() { StartDestroyHook::hook(); }
 void DropItem() {
     DropItemHook1::hook();
@@ -630,4 +677,6 @@ void UseBucketTakeEvent() {
 void ConsumeTotemEvent() { ConsumeTotemHook::hook(); }
 void SetArmorEvent() { SetArmorHook::hook(); }
 void InteractEntityEvent() { InteractEntityHook::hook(); }
+void AddEffectEvent() { AddEffectHook::hook(); }
+void RemoveEffectEvent() { RemoveEffectHook::hook(); }
 } // namespace lse::events::player

src/lse/events/PlayerEvents.h

@@ -20,4 +20,6 @@ void UseBucketTakeEvent();
 void ConsumeTotemEvent();
 void SetArmorEvent();
 void InteractEntityEvent();
-}
+void AddEffectEvent();
+void RemoveEffectEvent();
+} // namespace lse::events::player